From 99bb964f8a13aab4b17b04aab082c83a5ad4ad38 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Thu, 27 Aug 2026 11:33:27 +0100 Subject: [PATCH 1/8] 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 | 868 ++++++-- 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 | 24 +- gradle/stage-orespawn-release.sh | 39 + gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 54413 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 53 +- 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/client/ClientSetup.java | 31 - .../mcmoddev/mineralogy/init/Features.java | 21 - .../mineralogy/init/MineralogyRegistry.java | 24 - .../mineralogy/worldgen/BakedGeomeConfig.java | 269 --- .../mcmoddev/mineralogy/worldgen/Geology.java | 114 -- .../mineralogy/worldgen/GeomeConfig.java | 603 ------ .../worldgen/GeomeDistributionSampler.java | 62 - .../mineralogy/worldgen/GeomeGeology.java | 124 -- .../worldgen/MineralogyOreGeneration.java | 113 -- .../mineralogy/worldgen/RockFamily.java | 24 - .../mineralogy/worldgen/StoneReplacer.java | 109 - .../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 | 16 +- .../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 | 8 +- .../mc}/mineralogy/blocks/RockRelief.java | 2 +- .../mc}/mineralogy/blocks/RockSalt.java | 4 +- .../mc}/mineralogy/blocks/RockSaltLamp.java | 11 +- .../mineralogy/blocks/RockSaltStreetLamp.java | 2 +- .../mc}/mineralogy/blocks/RockSlab.java | 8 +- .../mc}/mineralogy/blocks/RockStairs.java | 4 +- .../mc}/mineralogy/blocks/RockWall.java | 6 +- .../mc/mineralogy/client/ClientSetup.java | 34 + .../compat/CobblestoneTagPolicy.java | 126 ++ .../moddev/mc}/mineralogy/data/Material.java | 180 +- .../mc}/mineralogy/data/MaterialData.java | 113 +- .../documentation/DocumentationExporter.java | 75 + .../mineralogy/fluids/MineralogyFluids.java | 78 + .../moddev/mc}/mineralogy/init/Blocks.java | 912 ++++----- .../moddev/mc}/mineralogy/init/Items.java | 40 +- .../mineralogy/init/MineralogyItemGroups.java | 38 +- .../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 | 112 +- .../mc}/mineralogy/lib/data/MaterialType.java | 20 +- .../moddev/mc}/mineralogy/lib/data/Names.java | 98 +- .../lib/exceptions/ItemNotFoundException.java | 28 +- .../exceptions/MaterialNotFoundException.java | 28 +- .../lib/exceptions/TabNotFoundException.java | 28 +- .../migration/LegacyOreConfigMigrator.java | 203 ++ .../LegacyTileEntityIdNormalizer.java | 107 + .../patching/LegacyWorldDataHook.java | 27 +- .../mc}/mineralogy/patching/PatchHandler.java | 6 +- .../tileentity/TileEntityRockFurnace.java | 8 +- .../mc}/mineralogy/util/BlockItemPair.java | 2 +- src/main/resources/META-INF/mods.toml | 13 +- .../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 - .../minecraft/recipes/mossy_cobblestone.json | 14 - .../data/minecraft/recipes/observer.json | 22 - .../data/minecraft/recipes/piston.json | 25 - .../data/minecraft/recipes/stone.json | 9 - .../recipes/amphibolite_brick.json | 8 +- .../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 | 8 +- .../recipes/amphibolite_smooth.json | 22 +- .../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 | 8 +- .../recipes/amphibolite_to_stone.json | 31 + .../recipes/amphibolite_wall.json | 8 +- .../advancements/recipes/andesite_brick.json | 8 +- .../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 | 24 +- ...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 | 8 +- .../advancements/recipes/andesite_smooth.json | 22 +- .../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 | 8 +- .../recipes/andesite_to_stone.json | 31 + .../advancements/recipes/andesite_wall.json | 8 +- .../advancements/recipes/basalt_brick.json | 8 +- .../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 | 24 +- ...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 | 8 +- .../advancements/recipes/basalt_smooth.json | 22 +- .../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 | 8 +- .../advancements/recipes/basalt_to_stone.json | 31 + .../advancements/recipes/basalt_wall.json | 8 +- .../recipes/basaltic_glass_brick.json | 8 +- .../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 | 8 +- .../recipes/basaltic_glass_smooth.json | 22 +- .../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 | 8 +- .../recipes/basaltic_glass_to_stone.json | 31 + .../recipes/basaltic_glass_wall.json | 8 +- .../advancements/recipes/chalk.json | 37 + .../advancements/recipes/chalk_dust.json | 37 + .../advancements/recipes/cobblestone.json | 32 + .../recipes/conglomerate_brick.json | 8 +- .../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 | 8 +- .../recipes/conglomerate_smooth.json | 22 +- .../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 | 8 +- .../recipes/conglomerate_to_stone.json | 31 + .../recipes/conglomerate_wall.json | 8 +- .../advancements/recipes/diabase_brick.json | 8 +- .../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 | 8 +- .../advancements/recipes/diabase_smooth.json | 22 +- .../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 | 8 +- .../recipes/diabase_to_stone.json | 31 + .../advancements/recipes/diabase_wall.json | 8 +- .../advancements/recipes/diorite_brick.json | 8 +- .../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 | 24 +- ...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 | 8 +- .../advancements/recipes/diorite_smooth.json | 22 +- .../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 | 8 +- .../recipes/diorite_to_stone.json | 31 + .../advancements/recipes/diorite_wall.json | 8 +- .../advancements/recipes/dolomite_brick.json | 8 +- .../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 | 8 +- .../advancements/recipes/dolomite_smooth.json | 22 +- .../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 | 8 +- .../recipes/dolomite_to_stone.json | 31 + .../advancements/recipes/dolomite_wall.json | 8 +- .../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 | 8 +- .../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 | 8 +- .../advancements/recipes/gabbro_smooth.json | 22 +- .../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 | 8 +- .../advancements/recipes/gabbro_to_stone.json | 31 + .../advancements/recipes/gabbro_wall.json | 8 +- .../advancements/recipes/gneiss_brick.json | 8 +- .../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 | 8 +- .../advancements/recipes/gneiss_smooth.json | 22 +- .../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 | 8 +- .../advancements/recipes/gneiss_to_stone.json | 31 + .../advancements/recipes/gneiss_wall.json | 8 +- .../advancements/recipes/granite_brick.json | 8 +- .../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 | 24 +- ...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 | 8 +- .../advancements/recipes/granite_smooth.json | 22 +- .../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 | 8 +- .../recipes/granite_to_stone.json | 31 + .../advancements/recipes/granite_wall.json | 8 +- .../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 | 8 +- .../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 | 8 +- .../advancements/recipes/hornfels_smooth.json | 22 +- .../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 | 8 +- .../recipes/hornfels_to_stone.json | 31 + .../advancements/recipes/hornfels_wall.json | 8 +- .../advancements/recipes/limestone_brick.json | 8 +- .../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 | 8 +- .../recipes/limestone_smooth.json | 22 +- .../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 | 8 +- .../recipes/limestone_to_stone.json | 31 + .../advancements/recipes/limestone_wall.json | 8 +- .../advancements/recipes/marble_brick.json | 8 +- .../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 | 8 +- .../advancements/recipes/marble_smooth.json | 22 +- .../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 | 8 +- .../advancements/recipes/marble_to_stone.json | 31 + .../advancements/recipes/marble_wall.json | 8 +- .../recipes/mineralfertilizer.json | 41 + .../advancements/recipes/nitrate_block.json | 41 + .../advancements/recipes/nitrate_dust.json | 41 + .../recipes/novaculite_brick.json | 8 +- .../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 | 8 +- .../recipes/novaculite_smooth.json | 22 +- .../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 | 8 +- .../recipes/novaculite_to_stone.json | 31 + .../advancements/recipes/novaculite_wall.json | 8 +- .../advancements/recipes/pegmatite_brick.json | 8 +- .../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 | 8 +- .../recipes/pegmatite_smooth.json | 22 +- .../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 | 8 +- .../recipes/pegmatite_to_stone.json | 31 + .../advancements/recipes/pegmatite_wall.json | 8 +- .../recipes/peridotite_brick.json | 8 +- .../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 | 8 +- .../recipes/peridotite_smooth.json | 22 +- .../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 | 8 +- .../recipes/peridotite_to_stone.json | 31 + .../advancements/recipes/peridotite_wall.json | 8 +- .../recipes/phosphorous_block.json | 41 + .../recipes/phosphorous_dust.json | 41 + .../advancements/recipes/phyllite_brick.json | 8 +- .../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 | 8 +- .../advancements/recipes/phyllite_smooth.json | 22 +- .../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 | 8 +- .../recipes/phyllite_to_stone.json | 31 + .../advancements/recipes/phyllite_wall.json | 8 +- .../advancements/recipes/quartzite_brick.json | 8 +- .../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 | 8 +- .../recipes/quartzite_smooth.json | 22 +- .../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 | 8 +- .../recipes/quartzite_to_stone.json | 31 + .../advancements/recipes/quartzite_wall.json | 8 +- .../advancements/recipes/rhyolite_brick.json | 8 +- .../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 | 8 +- .../advancements/recipes/rhyolite_smooth.json | 22 +- .../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 | 8 +- .../recipes/rhyolite_to_stone.json | 31 + .../advancements/recipes/rhyolite_wall.json | 8 +- .../advancements/recipes/rock_salt.json | 37 + .../advancements/recipes/rock_salt_brick.json | 8 +- .../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 | 8 +- .../recipes/rock_salt_smooth.json | 22 +- .../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 | 8 +- .../recipes/rock_salt_to_stone.json | 31 + .../advancements/recipes/rock_salt_wall.json | 8 +- .../advancements/recipes/rocksaltlamp.json | 12 +- .../recipes/rocksaltstreetlamp.json | 12 +- .../advancements/recipes/schist_brick.json | 8 +- .../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 | 8 +- .../advancements/recipes/schist_smooth.json | 22 +- .../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 | 8 +- .../advancements/recipes/schist_to_stone.json | 31 + .../advancements/recipes/schist_wall.json | 8 +- .../advancements/recipes/scoria_brick.json | 8 +- .../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 | 8 +- .../advancements/recipes/scoria_smooth.json | 22 +- .../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 | 8 +- .../advancements/recipes/scoria_to_stone.json | 31 + .../advancements/recipes/scoria_wall.json | 8 +- .../advancements/recipes/shale_brick.json | 8 +- .../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 | 8 +- .../advancements/recipes/shale_smooth.json | 22 +- .../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 | 8 +- .../advancements/recipes/shale_to_stone.json | 31 + .../advancements/recipes/shale_wall.json | 8 +- .../advancements/recipes/siltstone_brick.json | 8 +- .../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 | 8 +- .../recipes/siltstone_smooth.json | 22 +- .../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 | 8 +- .../recipes/siltstone_to_stone.json | 31 + .../advancements/recipes/siltstone_wall.json | 8 +- .../advancements/recipes/slate_brick.json | 8 +- .../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 | 8 +- .../advancements/recipes/slate_smooth.json | 22 +- .../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 | 8 +- .../advancements/recipes/slate_to_stone.json | 31 + .../advancements/recipes/slate_wall.json | 8 +- .../advancements/recipes/sulfur_block.json | 41 + .../advancements/recipes/sulfur_dust.json | 41 + .../advancements/recipes/tuff_brick.json | 8 +- .../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 | 24 +- ...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 | 8 +- .../advancements/recipes/tuff_smooth.json | 22 +- .../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 | 8 +- .../advancements/recipes/tuff_to_stone.json | 31 + .../advancements/recipes/tuff_wall.json | 8 +- .../data/mineralogy/orespawn/provider.json | 636 ++++++ .../mineralogy/recipes/amphibolite_brick.json | 16 +- .../amphibolite_brick_block_polishing.json | 25 + .../recipes/amphibolite_brick_furnace.json | 27 +- .../recipes/amphibolite_brick_slab.json | 18 +- .../amphibolite_brick_slab_polishing.json | 25 + .../amphibolite_brick_slab_recombination.json | 25 + .../recipes/amphibolite_brick_stairs.json | 20 +- .../amphibolite_brick_stairs_polishing.json | 25 + .../recipes/amphibolite_brick_wall.json | 20 +- .../amphibolite_brick_wall_polishing.json | 25 + .../recipes/amphibolite_cobblestone.json | 5 +- .../recipes/amphibolite_furnace.json | 23 +- .../amphibolite_furnace_from_rock.json | 26 - ...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 | 18 +- .../recipes/amphibolite_relief_blank.json | 18 +- .../recipes/amphibolite_relief_cross.json | 18 +- .../recipes/amphibolite_relief_hammer.json | 18 +- .../recipes/amphibolite_relief_hoe.json | 18 +- .../amphibolite_relief_horizontal.json | 18 +- .../recipes/amphibolite_relief_i.json | 18 +- .../recipes/amphibolite_relief_left.json | 18 +- .../recipes/amphibolite_relief_pickaxe.json | 18 +- .../recipes/amphibolite_relief_plus.json | 18 +- .../recipes/amphibolite_relief_right.json | 34 +- .../recipes/amphibolite_relief_sword.json | 18 +- .../recipes/amphibolite_relief_vertical.json | 18 +- .../mineralogy/recipes/amphibolite_slab.json | 14 +- ...te_slab_from_amphibolite_stonecutting.json | 14 - .../recipes/amphibolite_smooth.json | 19 +- .../recipes/amphibolite_smooth_brick.json | 20 +- .../amphibolite_smooth_brick_furnace.json | 31 +- .../amphibolite_smooth_brick_slab.json | 22 +- .../amphibolite_smooth_brick_stairs.json | 24 +- .../amphibolite_smooth_brick_wall.json | 24 +- .../recipes/amphibolite_smooth_furnace.json | 27 +- .../recipes/amphibolite_smooth_slab.json | 18 +- .../recipes/amphibolite_smooth_stairs.json | 20 +- .../recipes/amphibolite_smooth_wall.json | 20 +- .../recipes/amphibolite_stairs.json | 16 +- ..._stairs_from_amphibolite_stonecutting.json | 14 - .../mineralogy/recipes/amphibolite_wall.json | 16 +- ...te_wall_from_amphibolite_stonecutting.json | 14 - .../mineralogy/recipes/andesite_brick.json | 16 +- .../andesite_brick_block_polishing.json | 25 + .../recipes/andesite_brick_furnace.json | 27 +- .../recipes/andesite_brick_slab.json | 18 +- .../andesite_brick_slab_polishing.json | 25 + .../andesite_brick_slab_recombination.json | 25 + .../recipes/andesite_brick_stairs.json | 20 +- .../andesite_brick_stairs_polishing.json | 25 + .../recipes/andesite_brick_wall.json | 20 +- .../andesite_brick_wall_polishing.json | 25 + .../recipes/andesite_cobblestone.json | 5 +- .../mineralogy/recipes/andesite_furnace.json | 23 +- .../recipes/andesite_furnace_from_rock.json | 26 - ...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 | 18 +- .../recipes/andesite_relief_blank.json | 18 +- .../recipes/andesite_relief_cross.json | 18 +- .../recipes/andesite_relief_hammer.json | 18 +- .../recipes/andesite_relief_hoe.json | 18 +- .../recipes/andesite_relief_horizontal.json | 18 +- .../mineralogy/recipes/andesite_relief_i.json | 18 +- .../recipes/andesite_relief_left.json | 18 +- .../recipes/andesite_relief_pickaxe.json | 18 +- .../recipes/andesite_relief_plus.json | 18 +- .../recipes/andesite_relief_right.json | 34 +- .../recipes/andesite_relief_sword.json | 18 +- .../recipes/andesite_relief_vertical.json | 18 +- .../mineralogy/recipes/andesite_slab.json | 14 +- ...esite_slab_from_andesite_stonecutting.json | 14 - .../mineralogy/recipes/andesite_smooth.json | 19 +- .../recipes/andesite_smooth_brick.json | 20 +- .../andesite_smooth_brick_furnace.json | 31 +- .../recipes/andesite_smooth_brick_slab.json | 22 +- .../recipes/andesite_smooth_brick_stairs.json | 24 +- .../recipes/andesite_smooth_brick_wall.json | 24 +- .../recipes/andesite_smooth_furnace.json | 27 +- .../recipes/andesite_smooth_slab.json | 18 +- .../recipes/andesite_smooth_stairs.json | 20 +- .../recipes/andesite_smooth_wall.json | 20 +- .../mineralogy/recipes/andesite_stairs.json | 16 +- ...ite_stairs_from_andesite_stonecutting.json | 14 - .../mineralogy/recipes/andesite_wall.json | 16 +- ...esite_wall_from_andesite_stonecutting.json | 14 - .../data/mineralogy/recipes/basalt_brick.json | 16 +- .../recipes/basalt_brick_block_polishing.json | 25 + .../recipes/basalt_brick_furnace.json | 27 +- .../mineralogy/recipes/basalt_brick_slab.json | 18 +- .../recipes/basalt_brick_slab_polishing.json | 25 + .../basalt_brick_slab_recombination.json | 25 + .../recipes/basalt_brick_stairs.json | 20 +- .../basalt_brick_stairs_polishing.json | 25 + .../mineralogy/recipes/basalt_brick_wall.json | 20 +- .../recipes/basalt_brick_wall_polishing.json | 25 + .../recipes/basalt_cobblestone.json | 5 +- .../mineralogy/recipes/basalt_furnace.json | 23 +- .../recipes/basalt_furnace_from_rock.json | 26 - ...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 | 18 +- .../recipes/basalt_relief_blank.json | 18 +- .../recipes/basalt_relief_cross.json | 18 +- .../recipes/basalt_relief_hammer.json | 18 +- .../mineralogy/recipes/basalt_relief_hoe.json | 18 +- .../recipes/basalt_relief_horizontal.json | 18 +- .../mineralogy/recipes/basalt_relief_i.json | 18 +- .../recipes/basalt_relief_left.json | 18 +- .../recipes/basalt_relief_pickaxe.json | 18 +- .../recipes/basalt_relief_plus.json | 18 +- .../recipes/basalt_relief_right.json | 34 +- .../recipes/basalt_relief_sword.json | 18 +- .../recipes/basalt_relief_vertical.json | 18 +- .../data/mineralogy/recipes/basalt_slab.json | 14 +- .../basalt_slab_from_basalt_stonecutting.json | 14 - .../mineralogy/recipes/basalt_smooth.json | 19 +- .../recipes/basalt_smooth_brick.json | 20 +- .../recipes/basalt_smooth_brick_furnace.json | 31 +- .../recipes/basalt_smooth_brick_slab.json | 22 +- .../recipes/basalt_smooth_brick_stairs.json | 24 +- .../recipes/basalt_smooth_brick_wall.json | 24 +- .../recipes/basalt_smooth_furnace.json | 27 +- .../recipes/basalt_smooth_slab.json | 18 +- .../recipes/basalt_smooth_stairs.json | 20 +- .../recipes/basalt_smooth_wall.json | 20 +- .../mineralogy/recipes/basalt_stairs.json | 16 +- ...asalt_stairs_from_basalt_stonecutting.json | 14 - .../data/mineralogy/recipes/basalt_wall.json | 16 +- .../basalt_wall_from_basalt_stonecutting.json | 14 - .../recipes/basaltic_glass_brick.json | 16 +- .../basaltic_glass_brick_block_polishing.json | 25 + .../recipes/basaltic_glass_brick_furnace.json | 27 +- .../recipes/basaltic_glass_brick_slab.json | 18 +- .../basaltic_glass_brick_slab_polishing.json | 25 + ...saltic_glass_brick_slab_recombination.json | 25 + .../recipes/basaltic_glass_brick_stairs.json | 20 +- ...basaltic_glass_brick_stairs_polishing.json | 25 + .../recipes/basaltic_glass_brick_wall.json | 20 +- .../basaltic_glass_brick_wall_polishing.json | 25 + .../recipes/basaltic_glass_cobblestone.json | 5 +- .../recipes/basaltic_glass_furnace.json | 23 +- .../basaltic_glass_furnace_from_rock.json | 26 - ...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 | 18 +- .../recipes/basaltic_glass_relief_blank.json | 18 +- .../recipes/basaltic_glass_relief_cross.json | 18 +- .../recipes/basaltic_glass_relief_hammer.json | 18 +- .../recipes/basaltic_glass_relief_hoe.json | 18 +- .../basaltic_glass_relief_horizontal.json | 18 +- .../recipes/basaltic_glass_relief_i.json | 18 +- .../recipes/basaltic_glass_relief_left.json | 18 +- .../basaltic_glass_relief_pickaxe.json | 18 +- .../recipes/basaltic_glass_relief_plus.json | 18 +- .../recipes/basaltic_glass_relief_right.json | 34 +- .../recipes/basaltic_glass_relief_sword.json | 18 +- .../basaltic_glass_relief_vertical.json | 18 +- .../recipes/basaltic_glass_slab.json | 14 +- ...slab_from_basaltic_glass_stonecutting.json | 14 - .../recipes/basaltic_glass_smooth.json | 19 +- .../recipes/basaltic_glass_smooth_brick.json | 20 +- .../basaltic_glass_smooth_brick_furnace.json | 31 +- .../basaltic_glass_smooth_brick_slab.json | 22 +- .../basaltic_glass_smooth_brick_stairs.json | 24 +- .../basaltic_glass_smooth_brick_wall.json | 24 +- .../basaltic_glass_smooth_furnace.json | 27 +- .../recipes/basaltic_glass_smooth_slab.json | 18 +- .../recipes/basaltic_glass_smooth_stairs.json | 20 +- .../recipes/basaltic_glass_smooth_wall.json | 20 +- .../recipes/basaltic_glass_stairs.json | 16 +- ...airs_from_basaltic_glass_stonecutting.json | 14 - .../recipes/basaltic_glass_wall.json | 16 +- ...wall_from_basaltic_glass_stonecutting.json | 14 - .../data/mineralogy/recipes/chalk.json | 33 +- .../data/mineralogy/recipes/chalk_dust.json | 26 +- .../data/mineralogy/recipes/cobblestone.json | 1 + .../recipes/conglomerate_brick.json | 16 +- .../conglomerate_brick_block_polishing.json | 25 + .../recipes/conglomerate_brick_furnace.json | 27 +- .../recipes/conglomerate_brick_slab.json | 18 +- .../conglomerate_brick_slab_polishing.json | 25 + ...conglomerate_brick_slab_recombination.json | 25 + .../recipes/conglomerate_brick_stairs.json | 20 +- .../conglomerate_brick_stairs_polishing.json | 25 + .../recipes/conglomerate_brick_wall.json | 20 +- .../conglomerate_brick_wall_polishing.json | 25 + .../recipes/conglomerate_cobblestone.json | 5 +- .../recipes/conglomerate_furnace.json | 23 +- .../conglomerate_furnace_from_rock.json | 26 - ...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 | 18 +- .../recipes/conglomerate_relief_blank.json | 18 +- .../recipes/conglomerate_relief_cross.json | 18 +- .../recipes/conglomerate_relief_hammer.json | 18 +- .../recipes/conglomerate_relief_hoe.json | 18 +- .../conglomerate_relief_horizontal.json | 18 +- .../recipes/conglomerate_relief_i.json | 18 +- .../recipes/conglomerate_relief_left.json | 18 +- .../recipes/conglomerate_relief_pickaxe.json | 18 +- .../recipes/conglomerate_relief_plus.json | 18 +- .../recipes/conglomerate_relief_right.json | 34 +- .../recipes/conglomerate_relief_sword.json | 18 +- .../recipes/conglomerate_relief_vertical.json | 18 +- .../mineralogy/recipes/conglomerate_slab.json | 14 +- ...e_slab_from_conglomerate_stonecutting.json | 14 - .../recipes/conglomerate_smooth.json | 19 +- .../recipes/conglomerate_smooth_brick.json | 20 +- .../conglomerate_smooth_brick_furnace.json | 31 +- .../conglomerate_smooth_brick_slab.json | 22 +- .../conglomerate_smooth_brick_stairs.json | 24 +- .../conglomerate_smooth_brick_wall.json | 24 +- .../recipes/conglomerate_smooth_furnace.json | 27 +- .../recipes/conglomerate_smooth_slab.json | 18 +- .../recipes/conglomerate_smooth_stairs.json | 20 +- .../recipes/conglomerate_smooth_wall.json | 20 +- .../recipes/conglomerate_stairs.json | 16 +- ...stairs_from_conglomerate_stonecutting.json | 14 - .../mineralogy/recipes/conglomerate_wall.json | 16 +- ...e_wall_from_conglomerate_stonecutting.json | 14 - .../mineralogy/recipes/diabase_brick.json | 16 +- .../diabase_brick_block_polishing.json | 25 + .../recipes/diabase_brick_furnace.json | 27 +- .../recipes/diabase_brick_slab.json | 18 +- .../recipes/diabase_brick_slab_polishing.json | 25 + .../diabase_brick_slab_recombination.json | 25 + .../recipes/diabase_brick_stairs.json | 20 +- .../diabase_brick_stairs_polishing.json | 25 + .../recipes/diabase_brick_wall.json | 20 +- .../recipes/diabase_brick_wall_polishing.json | 25 + .../recipes/diabase_cobblestone.json | 5 +- .../mineralogy/recipes/diabase_furnace.json | 23 +- .../recipes/diabase_furnace_from_rock.json | 26 - ...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 | 18 +- .../recipes/diabase_relief_blank.json | 18 +- .../recipes/diabase_relief_cross.json | 18 +- .../recipes/diabase_relief_hammer.json | 18 +- .../recipes/diabase_relief_hoe.json | 18 +- .../recipes/diabase_relief_horizontal.json | 18 +- .../mineralogy/recipes/diabase_relief_i.json | 18 +- .../recipes/diabase_relief_left.json | 18 +- .../recipes/diabase_relief_pickaxe.json | 18 +- .../recipes/diabase_relief_plus.json | 18 +- .../recipes/diabase_relief_right.json | 34 +- .../recipes/diabase_relief_sword.json | 18 +- .../recipes/diabase_relief_vertical.json | 18 +- .../data/mineralogy/recipes/diabase_slab.json | 14 +- ...iabase_slab_from_diabase_stonecutting.json | 14 - .../mineralogy/recipes/diabase_smooth.json | 19 +- .../recipes/diabase_smooth_brick.json | 20 +- .../recipes/diabase_smooth_brick_furnace.json | 31 +- .../recipes/diabase_smooth_brick_slab.json | 22 +- .../recipes/diabase_smooth_brick_stairs.json | 24 +- .../recipes/diabase_smooth_brick_wall.json | 24 +- .../recipes/diabase_smooth_furnace.json | 27 +- .../recipes/diabase_smooth_slab.json | 18 +- .../recipes/diabase_smooth_stairs.json | 20 +- .../recipes/diabase_smooth_wall.json | 20 +- .../mineralogy/recipes/diabase_stairs.json | 16 +- ...base_stairs_from_diabase_stonecutting.json | 14 - .../data/mineralogy/recipes/diabase_wall.json | 16 +- ...iabase_wall_from_diabase_stonecutting.json | 14 - .../mineralogy/recipes/diorite_brick.json | 16 +- .../diorite_brick_block_polishing.json | 25 + .../recipes/diorite_brick_furnace.json | 27 +- .../recipes/diorite_brick_slab.json | 18 +- .../recipes/diorite_brick_slab_polishing.json | 25 + .../diorite_brick_slab_recombination.json | 25 + .../recipes/diorite_brick_stairs.json | 20 +- .../diorite_brick_stairs_polishing.json | 25 + .../recipes/diorite_brick_wall.json | 20 +- .../recipes/diorite_brick_wall_polishing.json | 25 + .../recipes/diorite_cobblestone.json | 5 +- .../mineralogy/recipes/diorite_furnace.json | 23 +- .../recipes/diorite_furnace_from_rock.json | 26 - ...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 | 18 +- .../recipes/diorite_relief_blank.json | 18 +- .../recipes/diorite_relief_cross.json | 18 +- .../recipes/diorite_relief_hammer.json | 18 +- .../recipes/diorite_relief_hoe.json | 18 +- .../recipes/diorite_relief_horizontal.json | 18 +- .../mineralogy/recipes/diorite_relief_i.json | 18 +- .../recipes/diorite_relief_left.json | 18 +- .../recipes/diorite_relief_pickaxe.json | 18 +- .../recipes/diorite_relief_plus.json | 18 +- .../recipes/diorite_relief_right.json | 34 +- .../recipes/diorite_relief_sword.json | 18 +- .../recipes/diorite_relief_vertical.json | 18 +- .../data/mineralogy/recipes/diorite_slab.json | 14 +- ...iorite_slab_from_diorite_stonecutting.json | 14 - .../mineralogy/recipes/diorite_smooth.json | 19 +- .../recipes/diorite_smooth_brick.json | 20 +- .../recipes/diorite_smooth_brick_furnace.json | 31 +- .../recipes/diorite_smooth_brick_slab.json | 22 +- .../recipes/diorite_smooth_brick_stairs.json | 24 +- .../recipes/diorite_smooth_brick_wall.json | 24 +- .../recipes/diorite_smooth_furnace.json | 27 +- .../recipes/diorite_smooth_slab.json | 18 +- .../recipes/diorite_smooth_stairs.json | 20 +- .../recipes/diorite_smooth_wall.json | 20 +- .../mineralogy/recipes/diorite_stairs.json | 16 +- ...rite_stairs_from_diorite_stonecutting.json | 14 - .../data/mineralogy/recipes/diorite_wall.json | 16 +- ...iorite_wall_from_diorite_stonecutting.json | 14 - .../mineralogy/recipes/dolomite_brick.json | 16 +- .../dolomite_brick_block_polishing.json | 25 + .../recipes/dolomite_brick_furnace.json | 27 +- .../recipes/dolomite_brick_slab.json | 18 +- .../dolomite_brick_slab_polishing.json | 25 + .../dolomite_brick_slab_recombination.json | 25 + .../recipes/dolomite_brick_stairs.json | 20 +- .../dolomite_brick_stairs_polishing.json | 25 + .../recipes/dolomite_brick_wall.json | 20 +- .../dolomite_brick_wall_polishing.json | 25 + .../recipes/dolomite_cobblestone.json | 5 +- .../mineralogy/recipes/dolomite_furnace.json | 23 +- .../recipes/dolomite_furnace_from_rock.json | 26 - ...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 | 18 +- .../recipes/dolomite_relief_blank.json | 18 +- .../recipes/dolomite_relief_cross.json | 18 +- .../recipes/dolomite_relief_hammer.json | 18 +- .../recipes/dolomite_relief_hoe.json | 18 +- .../recipes/dolomite_relief_horizontal.json | 18 +- .../mineralogy/recipes/dolomite_relief_i.json | 18 +- .../recipes/dolomite_relief_left.json | 18 +- .../recipes/dolomite_relief_pickaxe.json | 18 +- .../recipes/dolomite_relief_plus.json | 18 +- .../recipes/dolomite_relief_right.json | 34 +- .../recipes/dolomite_relief_sword.json | 18 +- .../recipes/dolomite_relief_vertical.json | 18 +- .../mineralogy/recipes/dolomite_slab.json | 14 +- ...omite_slab_from_dolomite_stonecutting.json | 14 - .../mineralogy/recipes/dolomite_smooth.json | 19 +- .../recipes/dolomite_smooth_brick.json | 20 +- .../dolomite_smooth_brick_furnace.json | 31 +- .../recipes/dolomite_smooth_brick_slab.json | 22 +- .../recipes/dolomite_smooth_brick_stairs.json | 24 +- .../recipes/dolomite_smooth_brick_wall.json | 24 +- .../recipes/dolomite_smooth_furnace.json | 27 +- .../recipes/dolomite_smooth_slab.json | 18 +- .../recipes/dolomite_smooth_stairs.json | 20 +- .../recipes/dolomite_smooth_wall.json | 20 +- .../mineralogy/recipes/dolomite_stairs.json | 16 +- ...ite_stairs_from_dolomite_stonecutting.json | 14 - .../mineralogy/recipes/dolomite_wall.json | 16 +- ...omite_wall_from_dolomite_stonecutting.json | 14 - .../data/mineralogy/recipes/drywall.json | 46 +- .../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 | 16 +- .../recipes/gabbro_brick_block_polishing.json | 25 + .../recipes/gabbro_brick_furnace.json | 27 +- .../mineralogy/recipes/gabbro_brick_slab.json | 18 +- .../recipes/gabbro_brick_slab_polishing.json | 25 + .../gabbro_brick_slab_recombination.json | 25 + .../recipes/gabbro_brick_stairs.json | 20 +- .../gabbro_brick_stairs_polishing.json | 25 + .../mineralogy/recipes/gabbro_brick_wall.json | 20 +- .../recipes/gabbro_brick_wall_polishing.json | 25 + .../recipes/gabbro_cobblestone.json | 5 +- .../mineralogy/recipes/gabbro_furnace.json | 23 +- .../recipes/gabbro_furnace_from_rock.json | 26 - ...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 | 18 +- .../recipes/gabbro_relief_blank.json | 18 +- .../recipes/gabbro_relief_cross.json | 18 +- .../recipes/gabbro_relief_hammer.json | 18 +- .../mineralogy/recipes/gabbro_relief_hoe.json | 18 +- .../recipes/gabbro_relief_horizontal.json | 18 +- .../mineralogy/recipes/gabbro_relief_i.json | 18 +- .../recipes/gabbro_relief_left.json | 18 +- .../recipes/gabbro_relief_pickaxe.json | 18 +- .../recipes/gabbro_relief_plus.json | 18 +- .../recipes/gabbro_relief_right.json | 34 +- .../recipes/gabbro_relief_sword.json | 18 +- .../recipes/gabbro_relief_vertical.json | 18 +- .../data/mineralogy/recipes/gabbro_slab.json | 14 +- .../gabbro_slab_from_gabbro_stonecutting.json | 14 - .../mineralogy/recipes/gabbro_smooth.json | 19 +- .../recipes/gabbro_smooth_brick.json | 20 +- .../recipes/gabbro_smooth_brick_furnace.json | 31 +- .../recipes/gabbro_smooth_brick_slab.json | 22 +- .../recipes/gabbro_smooth_brick_stairs.json | 24 +- .../recipes/gabbro_smooth_brick_wall.json | 24 +- .../recipes/gabbro_smooth_furnace.json | 27 +- .../recipes/gabbro_smooth_slab.json | 18 +- .../recipes/gabbro_smooth_stairs.json | 20 +- .../recipes/gabbro_smooth_wall.json | 20 +- .../mineralogy/recipes/gabbro_stairs.json | 16 +- ...abbro_stairs_from_gabbro_stonecutting.json | 14 - .../data/mineralogy/recipes/gabbro_wall.json | 16 +- .../gabbro_wall_from_gabbro_stonecutting.json | 14 - .../data/mineralogy/recipes/gneiss_brick.json | 16 +- .../recipes/gneiss_brick_block_polishing.json | 25 + .../recipes/gneiss_brick_furnace.json | 27 +- .../mineralogy/recipes/gneiss_brick_slab.json | 18 +- .../recipes/gneiss_brick_slab_polishing.json | 25 + .../gneiss_brick_slab_recombination.json | 25 + .../recipes/gneiss_brick_stairs.json | 20 +- .../gneiss_brick_stairs_polishing.json | 25 + .../mineralogy/recipes/gneiss_brick_wall.json | 20 +- .../recipes/gneiss_brick_wall_polishing.json | 25 + .../recipes/gneiss_cobblestone.json | 5 +- .../mineralogy/recipes/gneiss_furnace.json | 23 +- .../recipes/gneiss_furnace_from_rock.json | 26 - ...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 | 18 +- .../recipes/gneiss_relief_blank.json | 18 +- .../recipes/gneiss_relief_cross.json | 18 +- .../recipes/gneiss_relief_hammer.json | 18 +- .../mineralogy/recipes/gneiss_relief_hoe.json | 18 +- .../recipes/gneiss_relief_horizontal.json | 18 +- .../mineralogy/recipes/gneiss_relief_i.json | 18 +- .../recipes/gneiss_relief_left.json | 18 +- .../recipes/gneiss_relief_pickaxe.json | 18 +- .../recipes/gneiss_relief_plus.json | 18 +- .../recipes/gneiss_relief_right.json | 34 +- .../recipes/gneiss_relief_sword.json | 18 +- .../recipes/gneiss_relief_vertical.json | 18 +- .../data/mineralogy/recipes/gneiss_slab.json | 14 +- .../gneiss_slab_from_gneiss_stonecutting.json | 14 - .../mineralogy/recipes/gneiss_smooth.json | 19 +- .../recipes/gneiss_smooth_brick.json | 20 +- .../recipes/gneiss_smooth_brick_furnace.json | 31 +- .../recipes/gneiss_smooth_brick_slab.json | 22 +- .../recipes/gneiss_smooth_brick_stairs.json | 24 +- .../recipes/gneiss_smooth_brick_wall.json | 24 +- .../recipes/gneiss_smooth_furnace.json | 27 +- .../recipes/gneiss_smooth_slab.json | 18 +- .../recipes/gneiss_smooth_stairs.json | 20 +- .../recipes/gneiss_smooth_wall.json | 20 +- .../mineralogy/recipes/gneiss_stairs.json | 16 +- ...neiss_stairs_from_gneiss_stonecutting.json | 14 - .../data/mineralogy/recipes/gneiss_wall.json | 16 +- .../gneiss_wall_from_gneiss_stonecutting.json | 14 - .../mineralogy/recipes/granite_brick.json | 16 +- .../granite_brick_block_polishing.json | 25 + .../recipes/granite_brick_furnace.json | 27 +- .../recipes/granite_brick_slab.json | 18 +- .../recipes/granite_brick_slab_polishing.json | 25 + .../granite_brick_slab_recombination.json | 25 + .../recipes/granite_brick_stairs.json | 20 +- .../granite_brick_stairs_polishing.json | 25 + .../recipes/granite_brick_wall.json | 20 +- .../recipes/granite_brick_wall_polishing.json | 25 + .../recipes/granite_cobblestone.json | 5 +- .../mineralogy/recipes/granite_furnace.json | 23 +- .../recipes/granite_furnace_from_rock.json | 26 - ...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 | 18 +- .../recipes/granite_relief_blank.json | 18 +- .../recipes/granite_relief_cross.json | 18 +- .../recipes/granite_relief_hammer.json | 18 +- .../recipes/granite_relief_hoe.json | 18 +- .../recipes/granite_relief_horizontal.json | 18 +- .../mineralogy/recipes/granite_relief_i.json | 18 +- .../recipes/granite_relief_left.json | 18 +- .../recipes/granite_relief_pickaxe.json | 18 +- .../recipes/granite_relief_plus.json | 18 +- .../recipes/granite_relief_right.json | 34 +- .../recipes/granite_relief_sword.json | 18 +- .../recipes/granite_relief_vertical.json | 18 +- .../data/mineralogy/recipes/granite_slab.json | 14 +- ...ranite_slab_from_granite_stonecutting.json | 14 - .../mineralogy/recipes/granite_smooth.json | 19 +- .../recipes/granite_smooth_brick.json | 20 +- .../recipes/granite_smooth_brick_furnace.json | 31 +- .../recipes/granite_smooth_brick_slab.json | 22 +- .../recipes/granite_smooth_brick_stairs.json | 24 +- .../recipes/granite_smooth_brick_wall.json | 24 +- .../recipes/granite_smooth_furnace.json | 27 +- .../recipes/granite_smooth_slab.json | 18 +- .../recipes/granite_smooth_stairs.json | 20 +- .../recipes/granite_smooth_wall.json | 20 +- .../mineralogy/recipes/granite_stairs.json | 16 +- ...nite_stairs_from_granite_stonecutting.json | 14 - .../data/mineralogy/recipes/granite_wall.json | 16 +- ...ranite_wall_from_granite_stonecutting.json | 14 - .../recipes/gunpowder_from_carbon.json | 18 - .../recipes/gunpowder_from_carbon_dust.json | 31 + .../recipes/gunpowder_from_charcoal.json | 24 + .../recipes/gunpowder_from_coal.json | 18 - .../recipes/gunpowder_from_coal_dust.json | 31 + .../recipes/gunpowder_from_sugar.json | 38 +- .../data/mineralogy/recipes/gypsum.json | 34 +- .../data/mineralogy/recipes/gypsum_dust.json | 26 +- .../mineralogy/recipes/hornfels_brick.json | 16 +- .../hornfels_brick_block_polishing.json | 25 + .../recipes/hornfels_brick_furnace.json | 27 +- .../recipes/hornfels_brick_slab.json | 18 +- .../hornfels_brick_slab_polishing.json | 25 + .../hornfels_brick_slab_recombination.json | 25 + .../recipes/hornfels_brick_stairs.json | 20 +- .../hornfels_brick_stairs_polishing.json | 25 + .../recipes/hornfels_brick_wall.json | 20 +- .../hornfels_brick_wall_polishing.json | 25 + .../recipes/hornfels_cobblestone.json | 5 +- .../mineralogy/recipes/hornfels_furnace.json | 23 +- .../recipes/hornfels_furnace_from_rock.json | 26 - ...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 | 18 +- .../recipes/hornfels_relief_blank.json | 18 +- .../recipes/hornfels_relief_cross.json | 18 +- .../recipes/hornfels_relief_hammer.json | 18 +- .../recipes/hornfels_relief_hoe.json | 18 +- .../recipes/hornfels_relief_horizontal.json | 18 +- .../mineralogy/recipes/hornfels_relief_i.json | 18 +- .../recipes/hornfels_relief_left.json | 18 +- .../recipes/hornfels_relief_pickaxe.json | 18 +- .../recipes/hornfels_relief_plus.json | 18 +- .../recipes/hornfels_relief_right.json | 34 +- .../recipes/hornfels_relief_sword.json | 18 +- .../recipes/hornfels_relief_vertical.json | 18 +- .../mineralogy/recipes/hornfels_slab.json | 14 +- ...nfels_slab_from_hornfels_stonecutting.json | 14 - .../mineralogy/recipes/hornfels_smooth.json | 19 +- .../recipes/hornfels_smooth_brick.json | 20 +- .../hornfels_smooth_brick_furnace.json | 31 +- .../recipes/hornfels_smooth_brick_slab.json | 22 +- .../recipes/hornfels_smooth_brick_stairs.json | 24 +- .../recipes/hornfels_smooth_brick_wall.json | 24 +- .../recipes/hornfels_smooth_furnace.json | 27 +- .../recipes/hornfels_smooth_slab.json | 18 +- .../recipes/hornfels_smooth_stairs.json | 20 +- .../recipes/hornfels_smooth_wall.json | 20 +- .../mineralogy/recipes/hornfels_stairs.json | 16 +- ...els_stairs_from_hornfels_stonecutting.json | 14 - .../mineralogy/recipes/hornfels_wall.json | 16 +- ...nfels_wall_from_hornfels_stonecutting.json | 14 - .../mineralogy/recipes/limestone_brick.json | 16 +- .../limestone_brick_block_polishing.json | 25 + .../recipes/limestone_brick_furnace.json | 27 +- .../recipes/limestone_brick_slab.json | 18 +- .../limestone_brick_slab_polishing.json | 25 + .../limestone_brick_slab_recombination.json | 25 + .../recipes/limestone_brick_stairs.json | 20 +- .../limestone_brick_stairs_polishing.json | 25 + .../recipes/limestone_brick_wall.json | 20 +- .../limestone_brick_wall_polishing.json | 25 + .../recipes/limestone_cobblestone.json | 5 +- .../mineralogy/recipes/limestone_furnace.json | 23 +- .../recipes/limestone_furnace_from_rock.json | 26 - ...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 | 18 +- .../recipes/limestone_relief_blank.json | 18 +- .../recipes/limestone_relief_cross.json | 18 +- .../recipes/limestone_relief_hammer.json | 18 +- .../recipes/limestone_relief_hoe.json | 18 +- .../recipes/limestone_relief_horizontal.json | 18 +- .../recipes/limestone_relief_i.json | 18 +- .../recipes/limestone_relief_left.json | 18 +- .../recipes/limestone_relief_pickaxe.json | 18 +- .../recipes/limestone_relief_plus.json | 18 +- .../recipes/limestone_relief_right.json | 34 +- .../recipes/limestone_relief_sword.json | 18 +- .../recipes/limestone_relief_vertical.json | 18 +- .../mineralogy/recipes/limestone_slab.json | 14 +- ...tone_slab_from_limestone_stonecutting.json | 14 - .../mineralogy/recipes/limestone_smooth.json | 19 +- .../recipes/limestone_smooth_brick.json | 20 +- .../limestone_smooth_brick_furnace.json | 31 +- .../recipes/limestone_smooth_brick_slab.json | 22 +- .../limestone_smooth_brick_stairs.json | 24 +- .../recipes/limestone_smooth_brick_wall.json | 24 +- .../recipes/limestone_smooth_furnace.json | 27 +- .../recipes/limestone_smooth_slab.json | 18 +- .../recipes/limestone_smooth_stairs.json | 20 +- .../recipes/limestone_smooth_wall.json | 20 +- .../mineralogy/recipes/limestone_stairs.json | 16 +- ...ne_stairs_from_limestone_stonecutting.json | 14 - .../mineralogy/recipes/limestone_wall.json | 16 +- ...tone_wall_from_limestone_stonecutting.json | 14 - .../data/mineralogy/recipes/marble_brick.json | 16 +- .../recipes/marble_brick_block_polishing.json | 25 + .../recipes/marble_brick_furnace.json | 27 +- .../mineralogy/recipes/marble_brick_slab.json | 18 +- .../recipes/marble_brick_slab_polishing.json | 25 + .../marble_brick_slab_recombination.json | 25 + .../recipes/marble_brick_stairs.json | 20 +- .../marble_brick_stairs_polishing.json | 25 + .../mineralogy/recipes/marble_brick_wall.json | 20 +- .../recipes/marble_brick_wall_polishing.json | 25 + .../recipes/marble_cobblestone.json | 5 +- .../mineralogy/recipes/marble_furnace.json | 23 +- .../recipes/marble_furnace_from_rock.json | 26 - ...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 | 18 +- .../recipes/marble_relief_blank.json | 18 +- .../recipes/marble_relief_cross.json | 18 +- .../recipes/marble_relief_hammer.json | 18 +- .../mineralogy/recipes/marble_relief_hoe.json | 18 +- .../recipes/marble_relief_horizontal.json | 18 +- .../mineralogy/recipes/marble_relief_i.json | 18 +- .../recipes/marble_relief_left.json | 18 +- .../recipes/marble_relief_pickaxe.json | 18 +- .../recipes/marble_relief_plus.json | 18 +- .../recipes/marble_relief_right.json | 34 +- .../recipes/marble_relief_sword.json | 18 +- .../recipes/marble_relief_vertical.json | 18 +- .../data/mineralogy/recipes/marble_slab.json | 14 +- .../marble_slab_from_marble_stonecutting.json | 14 - .../mineralogy/recipes/marble_smooth.json | 19 +- .../recipes/marble_smooth_brick.json | 20 +- .../recipes/marble_smooth_brick_furnace.json | 31 +- .../recipes/marble_smooth_brick_slab.json | 22 +- .../recipes/marble_smooth_brick_stairs.json | 24 +- .../recipes/marble_smooth_brick_wall.json | 24 +- .../recipes/marble_smooth_furnace.json | 27 +- .../recipes/marble_smooth_slab.json | 18 +- .../recipes/marble_smooth_stairs.json | 20 +- .../recipes/marble_smooth_wall.json | 20 +- .../mineralogy/recipes/marble_stairs.json | 16 +- ...arble_stairs_from_marble_stonecutting.json | 14 - .../data/mineralogy/recipes/marble_wall.json | 16 +- .../marble_wall_from_marble_stonecutting.json | 14 - .../recipes/mineral_fertilizer.json | 14 - .../mineralogy/recipes/mineralfertilizer.json | 25 + .../mineralogy/recipes/nitrate_block.json | 39 +- .../data/mineralogy/recipes/nitrate_dust.json | 30 +- .../mineralogy/recipes/novaculite_brick.json | 16 +- .../novaculite_brick_block_polishing.json | 25 + .../recipes/novaculite_brick_furnace.json | 27 +- .../recipes/novaculite_brick_slab.json | 18 +- .../novaculite_brick_slab_polishing.json | 25 + .../novaculite_brick_slab_recombination.json | 25 + .../recipes/novaculite_brick_stairs.json | 20 +- .../novaculite_brick_stairs_polishing.json | 25 + .../recipes/novaculite_brick_wall.json | 20 +- .../novaculite_brick_wall_polishing.json | 25 + .../recipes/novaculite_cobblestone.json | 5 +- .../recipes/novaculite_furnace.json | 23 +- .../recipes/novaculite_furnace_from_rock.json | 26 - ...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 | 18 +- .../recipes/novaculite_relief_blank.json | 18 +- .../recipes/novaculite_relief_cross.json | 18 +- .../recipes/novaculite_relief_hammer.json | 18 +- .../recipes/novaculite_relief_hoe.json | 18 +- .../recipes/novaculite_relief_horizontal.json | 18 +- .../recipes/novaculite_relief_i.json | 18 +- .../recipes/novaculite_relief_left.json | 18 +- .../recipes/novaculite_relief_pickaxe.json | 18 +- .../recipes/novaculite_relief_plus.json | 18 +- .../recipes/novaculite_relief_right.json | 34 +- .../recipes/novaculite_relief_sword.json | 18 +- .../recipes/novaculite_relief_vertical.json | 18 +- .../mineralogy/recipes/novaculite_slab.json | 14 +- ...ite_slab_from_novaculite_stonecutting.json | 14 - .../mineralogy/recipes/novaculite_smooth.json | 19 +- .../recipes/novaculite_smooth_brick.json | 20 +- .../novaculite_smooth_brick_furnace.json | 31 +- .../recipes/novaculite_smooth_brick_slab.json | 22 +- .../novaculite_smooth_brick_stairs.json | 24 +- .../recipes/novaculite_smooth_brick_wall.json | 24 +- .../recipes/novaculite_smooth_furnace.json | 27 +- .../recipes/novaculite_smooth_slab.json | 18 +- .../recipes/novaculite_smooth_stairs.json | 20 +- .../recipes/novaculite_smooth_wall.json | 20 +- .../mineralogy/recipes/novaculite_stairs.json | 16 +- ...e_stairs_from_novaculite_stonecutting.json | 14 - .../mineralogy/recipes/novaculite_wall.json | 16 +- ...ite_wall_from_novaculite_stonecutting.json | 14 - .../mineralogy/recipes/pegmatite_brick.json | 16 +- .../pegmatite_brick_block_polishing.json | 25 + .../recipes/pegmatite_brick_furnace.json | 27 +- .../recipes/pegmatite_brick_slab.json | 18 +- .../pegmatite_brick_slab_polishing.json | 25 + .../pegmatite_brick_slab_recombination.json | 25 + .../recipes/pegmatite_brick_stairs.json | 20 +- .../pegmatite_brick_stairs_polishing.json | 25 + .../recipes/pegmatite_brick_wall.json | 20 +- .../pegmatite_brick_wall_polishing.json | 25 + .../recipes/pegmatite_cobblestone.json | 5 +- .../mineralogy/recipes/pegmatite_furnace.json | 23 +- .../recipes/pegmatite_furnace_from_rock.json | 26 - ...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 | 18 +- .../recipes/pegmatite_relief_blank.json | 18 +- .../recipes/pegmatite_relief_cross.json | 18 +- .../recipes/pegmatite_relief_hammer.json | 18 +- .../recipes/pegmatite_relief_hoe.json | 18 +- .../recipes/pegmatite_relief_horizontal.json | 18 +- .../recipes/pegmatite_relief_i.json | 18 +- .../recipes/pegmatite_relief_left.json | 18 +- .../recipes/pegmatite_relief_pickaxe.json | 18 +- .../recipes/pegmatite_relief_plus.json | 18 +- .../recipes/pegmatite_relief_right.json | 34 +- .../recipes/pegmatite_relief_sword.json | 18 +- .../recipes/pegmatite_relief_vertical.json | 18 +- .../mineralogy/recipes/pegmatite_slab.json | 14 +- ...tite_slab_from_pegmatite_stonecutting.json | 14 - .../mineralogy/recipes/pegmatite_smooth.json | 19 +- .../recipes/pegmatite_smooth_brick.json | 20 +- .../pegmatite_smooth_brick_furnace.json | 31 +- .../recipes/pegmatite_smooth_brick_slab.json | 22 +- .../pegmatite_smooth_brick_stairs.json | 24 +- .../recipes/pegmatite_smooth_brick_wall.json | 24 +- .../recipes/pegmatite_smooth_furnace.json | 27 +- .../recipes/pegmatite_smooth_slab.json | 18 +- .../recipes/pegmatite_smooth_stairs.json | 20 +- .../recipes/pegmatite_smooth_wall.json | 20 +- .../mineralogy/recipes/pegmatite_stairs.json | 16 +- ...te_stairs_from_pegmatite_stonecutting.json | 14 - .../mineralogy/recipes/pegmatite_wall.json | 16 +- ...tite_wall_from_pegmatite_stonecutting.json | 14 - .../mineralogy/recipes/peridotite_brick.json | 16 +- .../peridotite_brick_block_polishing.json | 25 + .../recipes/peridotite_brick_furnace.json | 27 +- .../recipes/peridotite_brick_slab.json | 18 +- .../peridotite_brick_slab_polishing.json | 25 + .../peridotite_brick_slab_recombination.json | 25 + .../recipes/peridotite_brick_stairs.json | 20 +- .../peridotite_brick_stairs_polishing.json | 25 + .../recipes/peridotite_brick_wall.json | 20 +- .../peridotite_brick_wall_polishing.json | 25 + .../recipes/peridotite_cobblestone.json | 5 +- .../recipes/peridotite_furnace.json | 23 +- .../recipes/peridotite_furnace_from_rock.json | 26 - ...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 | 18 +- .../recipes/peridotite_relief_blank.json | 18 +- .../recipes/peridotite_relief_cross.json | 18 +- .../recipes/peridotite_relief_hammer.json | 18 +- .../recipes/peridotite_relief_hoe.json | 18 +- .../recipes/peridotite_relief_horizontal.json | 18 +- .../recipes/peridotite_relief_i.json | 18 +- .../recipes/peridotite_relief_left.json | 18 +- .../recipes/peridotite_relief_pickaxe.json | 18 +- .../recipes/peridotite_relief_plus.json | 18 +- .../recipes/peridotite_relief_right.json | 34 +- .../recipes/peridotite_relief_sword.json | 18 +- .../recipes/peridotite_relief_vertical.json | 18 +- .../mineralogy/recipes/peridotite_slab.json | 14 +- ...ite_slab_from_peridotite_stonecutting.json | 14 - .../mineralogy/recipes/peridotite_smooth.json | 19 +- .../recipes/peridotite_smooth_brick.json | 20 +- .../peridotite_smooth_brick_furnace.json | 31 +- .../recipes/peridotite_smooth_brick_slab.json | 22 +- .../peridotite_smooth_brick_stairs.json | 24 +- .../recipes/peridotite_smooth_brick_wall.json | 24 +- .../recipes/peridotite_smooth_furnace.json | 27 +- .../recipes/peridotite_smooth_slab.json | 18 +- .../recipes/peridotite_smooth_stairs.json | 20 +- .../recipes/peridotite_smooth_wall.json | 20 +- .../mineralogy/recipes/peridotite_stairs.json | 16 +- ...e_stairs_from_peridotite_stonecutting.json | 14 - .../mineralogy/recipes/peridotite_wall.json | 16 +- ...ite_wall_from_peridotite_stonecutting.json | 14 - .../mineralogy/recipes/phosphorous_block.json | 39 +- .../mineralogy/recipes/phosphorous_dust.json | 30 +- .../mineralogy/recipes/phyllite_brick.json | 16 +- .../phyllite_brick_block_polishing.json | 25 + .../recipes/phyllite_brick_furnace.json | 27 +- .../recipes/phyllite_brick_slab.json | 18 +- .../phyllite_brick_slab_polishing.json | 25 + .../phyllite_brick_slab_recombination.json | 25 + .../recipes/phyllite_brick_stairs.json | 20 +- .../phyllite_brick_stairs_polishing.json | 25 + .../recipes/phyllite_brick_wall.json | 20 +- .../phyllite_brick_wall_polishing.json | 25 + .../recipes/phyllite_cobblestone.json | 5 +- .../mineralogy/recipes/phyllite_furnace.json | 23 +- .../recipes/phyllite_furnace_from_rock.json | 26 - ...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 | 18 +- .../recipes/phyllite_relief_blank.json | 18 +- .../recipes/phyllite_relief_cross.json | 18 +- .../recipes/phyllite_relief_hammer.json | 18 +- .../recipes/phyllite_relief_hoe.json | 18 +- .../recipes/phyllite_relief_horizontal.json | 18 +- .../mineralogy/recipes/phyllite_relief_i.json | 18 +- .../recipes/phyllite_relief_left.json | 18 +- .../recipes/phyllite_relief_pickaxe.json | 18 +- .../recipes/phyllite_relief_plus.json | 18 +- .../recipes/phyllite_relief_right.json | 34 +- .../recipes/phyllite_relief_sword.json | 18 +- .../recipes/phyllite_relief_vertical.json | 18 +- .../mineralogy/recipes/phyllite_slab.json | 14 +- ...llite_slab_from_phyllite_stonecutting.json | 14 - .../mineralogy/recipes/phyllite_smooth.json | 19 +- .../recipes/phyllite_smooth_brick.json | 20 +- .../phyllite_smooth_brick_furnace.json | 31 +- .../recipes/phyllite_smooth_brick_slab.json | 22 +- .../recipes/phyllite_smooth_brick_stairs.json | 24 +- .../recipes/phyllite_smooth_brick_wall.json | 24 +- .../recipes/phyllite_smooth_furnace.json | 27 +- .../recipes/phyllite_smooth_slab.json | 18 +- .../recipes/phyllite_smooth_stairs.json | 20 +- .../recipes/phyllite_smooth_wall.json | 20 +- .../mineralogy/recipes/phyllite_stairs.json | 16 +- ...ite_stairs_from_phyllite_stonecutting.json | 14 - .../mineralogy/recipes/phyllite_wall.json | 16 +- ...llite_wall_from_phyllite_stonecutting.json | 14 - .../mineralogy/recipes/quartzite_brick.json | 16 +- .../quartzite_brick_block_polishing.json | 25 + .../recipes/quartzite_brick_furnace.json | 27 +- .../recipes/quartzite_brick_slab.json | 18 +- .../quartzite_brick_slab_polishing.json | 25 + .../quartzite_brick_slab_recombination.json | 25 + .../recipes/quartzite_brick_stairs.json | 20 +- .../quartzite_brick_stairs_polishing.json | 25 + .../recipes/quartzite_brick_wall.json | 20 +- .../quartzite_brick_wall_polishing.json | 25 + .../recipes/quartzite_cobblestone.json | 5 +- .../mineralogy/recipes/quartzite_furnace.json | 23 +- .../recipes/quartzite_furnace_from_rock.json | 26 - ...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 | 18 +- .../recipes/quartzite_relief_blank.json | 18 +- .../recipes/quartzite_relief_cross.json | 18 +- .../recipes/quartzite_relief_hammer.json | 18 +- .../recipes/quartzite_relief_hoe.json | 18 +- .../recipes/quartzite_relief_horizontal.json | 18 +- .../recipes/quartzite_relief_i.json | 18 +- .../recipes/quartzite_relief_left.json | 18 +- .../recipes/quartzite_relief_pickaxe.json | 18 +- .../recipes/quartzite_relief_plus.json | 18 +- .../recipes/quartzite_relief_right.json | 34 +- .../recipes/quartzite_relief_sword.json | 18 +- .../recipes/quartzite_relief_vertical.json | 18 +- .../mineralogy/recipes/quartzite_slab.json | 14 +- ...zite_slab_from_quartzite_stonecutting.json | 14 - .../mineralogy/recipes/quartzite_smooth.json | 19 +- .../recipes/quartzite_smooth_brick.json | 20 +- .../quartzite_smooth_brick_furnace.json | 31 +- .../recipes/quartzite_smooth_brick_slab.json | 22 +- .../quartzite_smooth_brick_stairs.json | 24 +- .../recipes/quartzite_smooth_brick_wall.json | 24 +- .../recipes/quartzite_smooth_furnace.json | 27 +- .../recipes/quartzite_smooth_slab.json | 18 +- .../recipes/quartzite_smooth_stairs.json | 20 +- .../recipes/quartzite_smooth_wall.json | 20 +- .../mineralogy/recipes/quartzite_stairs.json | 16 +- ...te_stairs_from_quartzite_stonecutting.json | 14 - .../mineralogy/recipes/quartzite_wall.json | 16 +- ...zite_wall_from_quartzite_stonecutting.json | 14 - .../mineralogy/recipes/rhyolite_brick.json | 16 +- .../rhyolite_brick_block_polishing.json | 25 + .../recipes/rhyolite_brick_furnace.json | 27 +- .../recipes/rhyolite_brick_slab.json | 18 +- .../rhyolite_brick_slab_polishing.json | 25 + .../rhyolite_brick_slab_recombination.json | 25 + .../recipes/rhyolite_brick_stairs.json | 20 +- .../rhyolite_brick_stairs_polishing.json | 25 + .../recipes/rhyolite_brick_wall.json | 20 +- .../rhyolite_brick_wall_polishing.json | 25 + .../recipes/rhyolite_cobblestone.json | 5 +- .../mineralogy/recipes/rhyolite_furnace.json | 23 +- .../recipes/rhyolite_furnace_from_rock.json | 26 - ...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 | 18 +- .../recipes/rhyolite_relief_blank.json | 18 +- .../recipes/rhyolite_relief_cross.json | 18 +- .../recipes/rhyolite_relief_hammer.json | 18 +- .../recipes/rhyolite_relief_hoe.json | 18 +- .../recipes/rhyolite_relief_horizontal.json | 18 +- .../mineralogy/recipes/rhyolite_relief_i.json | 18 +- .../recipes/rhyolite_relief_left.json | 18 +- .../recipes/rhyolite_relief_pickaxe.json | 18 +- .../recipes/rhyolite_relief_plus.json | 18 +- .../recipes/rhyolite_relief_right.json | 34 +- .../recipes/rhyolite_relief_sword.json | 18 +- .../recipes/rhyolite_relief_vertical.json | 18 +- .../mineralogy/recipes/rhyolite_slab.json | 14 +- ...olite_slab_from_rhyolite_stonecutting.json | 14 - .../mineralogy/recipes/rhyolite_smooth.json | 19 +- .../recipes/rhyolite_smooth_brick.json | 20 +- .../rhyolite_smooth_brick_furnace.json | 31 +- .../recipes/rhyolite_smooth_brick_slab.json | 22 +- .../recipes/rhyolite_smooth_brick_stairs.json | 24 +- .../recipes/rhyolite_smooth_brick_wall.json | 24 +- .../recipes/rhyolite_smooth_furnace.json | 27 +- .../recipes/rhyolite_smooth_slab.json | 18 +- .../recipes/rhyolite_smooth_stairs.json | 20 +- .../recipes/rhyolite_smooth_wall.json | 20 +- .../mineralogy/recipes/rhyolite_stairs.json | 16 +- ...ite_stairs_from_rhyolite_stonecutting.json | 14 - .../mineralogy/recipes/rhyolite_wall.json | 16 +- ...olite_wall_from_rhyolite_stonecutting.json | 14 - .../data/mineralogy/recipes/rock_salt.json | 33 +- .../mineralogy/recipes/rock_salt_brick.json | 16 +- .../rock_salt_brick_block_polishing.json | 25 + .../recipes/rock_salt_brick_furnace.json | 27 +- .../recipes/rock_salt_brick_slab.json | 18 +- .../rock_salt_brick_slab_polishing.json | 25 + .../rock_salt_brick_slab_recombination.json | 25 + .../recipes/rock_salt_brick_stairs.json | 20 +- .../rock_salt_brick_stairs_polishing.json | 25 + .../recipes/rock_salt_brick_wall.json | 20 +- .../rock_salt_brick_wall_polishing.json | 25 + .../recipes/rock_salt_cobblestone.json | 5 +- .../mineralogy/recipes/rock_salt_dust.json | 26 +- .../mineralogy/recipes/rock_salt_furnace.json | 23 +- .../recipes/rock_salt_furnace_from_rock.json | 26 - ...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 | 18 +- .../recipes/rock_salt_relief_blank.json | 18 +- .../recipes/rock_salt_relief_cross.json | 18 +- .../recipes/rock_salt_relief_hammer.json | 18 +- .../recipes/rock_salt_relief_hoe.json | 18 +- .../recipes/rock_salt_relief_horizontal.json | 18 +- .../recipes/rock_salt_relief_i.json | 18 +- .../recipes/rock_salt_relief_left.json | 18 +- .../recipes/rock_salt_relief_pickaxe.json | 18 +- .../recipes/rock_salt_relief_plus.json | 18 +- .../recipes/rock_salt_relief_right.json | 34 +- .../recipes/rock_salt_relief_sword.json | 18 +- .../recipes/rock_salt_relief_vertical.json | 18 +- .../mineralogy/recipes/rock_salt_slab.json | 14 +- ...salt_slab_from_rock_salt_stonecutting.json | 14 - .../mineralogy/recipes/rock_salt_smooth.json | 19 +- .../recipes/rock_salt_smooth_brick.json | 20 +- .../rock_salt_smooth_brick_furnace.json | 31 +- .../recipes/rock_salt_smooth_brick_slab.json | 22 +- .../rock_salt_smooth_brick_stairs.json | 24 +- .../recipes/rock_salt_smooth_brick_wall.json | 24 +- .../recipes/rock_salt_smooth_furnace.json | 27 +- .../recipes/rock_salt_smooth_slab.json | 18 +- .../recipes/rock_salt_smooth_stairs.json | 20 +- .../recipes/rock_salt_smooth_wall.json | 20 +- .../mineralogy/recipes/rock_salt_stairs.json | 16 +- ...lt_stairs_from_rock_salt_stonecutting.json | 14 - .../mineralogy/recipes/rock_salt_wall.json | 16 +- ...salt_wall_from_rock_salt_stonecutting.json | 14 - .../data/mineralogy/recipes/rocksaltlamp.json | 41 +- .../recipes/rocksaltstreetlamp.json | 45 +- .../data/mineralogy/recipes/schist_brick.json | 16 +- .../recipes/schist_brick_block_polishing.json | 25 + .../recipes/schist_brick_furnace.json | 27 +- .../mineralogy/recipes/schist_brick_slab.json | 18 +- .../recipes/schist_brick_slab_polishing.json | 25 + .../schist_brick_slab_recombination.json | 25 + .../recipes/schist_brick_stairs.json | 20 +- .../schist_brick_stairs_polishing.json | 25 + .../mineralogy/recipes/schist_brick_wall.json | 20 +- .../recipes/schist_brick_wall_polishing.json | 25 + .../recipes/schist_cobblestone.json | 5 +- .../mineralogy/recipes/schist_furnace.json | 23 +- .../recipes/schist_furnace_from_rock.json | 26 - ...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 | 18 +- .../recipes/schist_relief_blank.json | 18 +- .../recipes/schist_relief_cross.json | 18 +- .../recipes/schist_relief_hammer.json | 18 +- .../mineralogy/recipes/schist_relief_hoe.json | 18 +- .../recipes/schist_relief_horizontal.json | 18 +- .../mineralogy/recipes/schist_relief_i.json | 18 +- .../recipes/schist_relief_left.json | 18 +- .../recipes/schist_relief_pickaxe.json | 18 +- .../recipes/schist_relief_plus.json | 18 +- .../recipes/schist_relief_right.json | 34 +- .../recipes/schist_relief_sword.json | 18 +- .../recipes/schist_relief_vertical.json | 18 +- .../data/mineralogy/recipes/schist_slab.json | 14 +- .../schist_slab_from_schist_stonecutting.json | 14 - .../mineralogy/recipes/schist_smooth.json | 19 +- .../recipes/schist_smooth_brick.json | 20 +- .../recipes/schist_smooth_brick_furnace.json | 31 +- .../recipes/schist_smooth_brick_slab.json | 22 +- .../recipes/schist_smooth_brick_stairs.json | 24 +- .../recipes/schist_smooth_brick_wall.json | 24 +- .../recipes/schist_smooth_furnace.json | 27 +- .../recipes/schist_smooth_slab.json | 18 +- .../recipes/schist_smooth_stairs.json | 20 +- .../recipes/schist_smooth_wall.json | 20 +- .../mineralogy/recipes/schist_stairs.json | 16 +- ...chist_stairs_from_schist_stonecutting.json | 14 - .../data/mineralogy/recipes/schist_wall.json | 16 +- .../schist_wall_from_schist_stonecutting.json | 14 - .../data/mineralogy/recipes/scoria_brick.json | 16 +- .../recipes/scoria_brick_block_polishing.json | 25 + .../recipes/scoria_brick_furnace.json | 27 +- .../mineralogy/recipes/scoria_brick_slab.json | 18 +- .../recipes/scoria_brick_slab_polishing.json | 25 + .../scoria_brick_slab_recombination.json | 25 + .../recipes/scoria_brick_stairs.json | 20 +- .../scoria_brick_stairs_polishing.json | 25 + .../mineralogy/recipes/scoria_brick_wall.json | 20 +- .../recipes/scoria_brick_wall_polishing.json | 25 + .../recipes/scoria_cobblestone.json | 5 +- .../mineralogy/recipes/scoria_furnace.json | 23 +- .../recipes/scoria_furnace_from_rock.json | 26 - ...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 | 18 +- .../recipes/scoria_relief_blank.json | 18 +- .../recipes/scoria_relief_cross.json | 18 +- .../recipes/scoria_relief_hammer.json | 18 +- .../mineralogy/recipes/scoria_relief_hoe.json | 18 +- .../recipes/scoria_relief_horizontal.json | 18 +- .../mineralogy/recipes/scoria_relief_i.json | 18 +- .../recipes/scoria_relief_left.json | 18 +- .../recipes/scoria_relief_pickaxe.json | 18 +- .../recipes/scoria_relief_plus.json | 18 +- .../recipes/scoria_relief_right.json | 34 +- .../recipes/scoria_relief_sword.json | 18 +- .../recipes/scoria_relief_vertical.json | 18 +- .../data/mineralogy/recipes/scoria_slab.json | 14 +- .../scoria_slab_from_scoria_stonecutting.json | 14 - .../mineralogy/recipes/scoria_smooth.json | 19 +- .../recipes/scoria_smooth_brick.json | 20 +- .../recipes/scoria_smooth_brick_furnace.json | 31 +- .../recipes/scoria_smooth_brick_slab.json | 22 +- .../recipes/scoria_smooth_brick_stairs.json | 24 +- .../recipes/scoria_smooth_brick_wall.json | 24 +- .../recipes/scoria_smooth_furnace.json | 27 +- .../recipes/scoria_smooth_slab.json | 18 +- .../recipes/scoria_smooth_stairs.json | 20 +- .../recipes/scoria_smooth_wall.json | 20 +- .../mineralogy/recipes/scoria_stairs.json | 16 +- ...coria_stairs_from_scoria_stonecutting.json | 14 - .../data/mineralogy/recipes/scoria_wall.json | 16 +- .../scoria_wall_from_scoria_stonecutting.json | 14 - .../data/mineralogy/recipes/shale_brick.json | 16 +- .../recipes/shale_brick_block_polishing.json | 25 + .../recipes/shale_brick_furnace.json | 27 +- .../mineralogy/recipes/shale_brick_slab.json | 18 +- .../recipes/shale_brick_slab_polishing.json | 25 + .../shale_brick_slab_recombination.json | 25 + .../recipes/shale_brick_stairs.json | 20 +- .../recipes/shale_brick_stairs_polishing.json | 25 + .../mineralogy/recipes/shale_brick_wall.json | 20 +- .../recipes/shale_brick_wall_polishing.json | 25 + .../mineralogy/recipes/shale_cobblestone.json | 5 +- .../mineralogy/recipes/shale_furnace.json | 23 +- .../recipes/shale_furnace_from_rock.json | 26 - ...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 | 18 +- .../recipes/shale_relief_blank.json | 18 +- .../recipes/shale_relief_cross.json | 18 +- .../recipes/shale_relief_hammer.json | 18 +- .../mineralogy/recipes/shale_relief_hoe.json | 18 +- .../recipes/shale_relief_horizontal.json | 18 +- .../mineralogy/recipes/shale_relief_i.json | 18 +- .../mineralogy/recipes/shale_relief_left.json | 18 +- .../recipes/shale_relief_pickaxe.json | 18 +- .../mineralogy/recipes/shale_relief_plus.json | 18 +- .../recipes/shale_relief_right.json | 34 +- .../recipes/shale_relief_sword.json | 18 +- .../recipes/shale_relief_vertical.json | 18 +- .../data/mineralogy/recipes/shale_slab.json | 14 +- .../shale_slab_from_shale_stonecutting.json | 14 - .../data/mineralogy/recipes/shale_smooth.json | 19 +- .../recipes/shale_smooth_brick.json | 20 +- .../recipes/shale_smooth_brick_furnace.json | 31 +- .../recipes/shale_smooth_brick_slab.json | 22 +- .../recipes/shale_smooth_brick_stairs.json | 24 +- .../recipes/shale_smooth_brick_wall.json | 24 +- .../recipes/shale_smooth_furnace.json | 27 +- .../mineralogy/recipes/shale_smooth_slab.json | 18 +- .../recipes/shale_smooth_stairs.json | 20 +- .../mineralogy/recipes/shale_smooth_wall.json | 20 +- .../data/mineralogy/recipes/shale_stairs.json | 16 +- .../shale_stairs_from_shale_stonecutting.json | 14 - .../data/mineralogy/recipes/shale_wall.json | 16 +- .../shale_wall_from_shale_stonecutting.json | 14 - .../mineralogy/recipes/siltstone_brick.json | 16 +- .../siltstone_brick_block_polishing.json | 25 + .../recipes/siltstone_brick_furnace.json | 27 +- .../recipes/siltstone_brick_slab.json | 18 +- .../siltstone_brick_slab_polishing.json | 25 + .../siltstone_brick_slab_recombination.json | 25 + .../recipes/siltstone_brick_stairs.json | 20 +- .../siltstone_brick_stairs_polishing.json | 25 + .../recipes/siltstone_brick_wall.json | 20 +- .../siltstone_brick_wall_polishing.json | 25 + .../recipes/siltstone_cobblestone.json | 5 +- .../mineralogy/recipes/siltstone_furnace.json | 23 +- .../recipes/siltstone_furnace_from_rock.json | 26 - ...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 | 18 +- .../recipes/siltstone_relief_blank.json | 18 +- .../recipes/siltstone_relief_cross.json | 18 +- .../recipes/siltstone_relief_hammer.json | 18 +- .../recipes/siltstone_relief_hoe.json | 18 +- .../recipes/siltstone_relief_horizontal.json | 18 +- .../recipes/siltstone_relief_i.json | 18 +- .../recipes/siltstone_relief_left.json | 18 +- .../recipes/siltstone_relief_pickaxe.json | 18 +- .../recipes/siltstone_relief_plus.json | 18 +- .../recipes/siltstone_relief_right.json | 34 +- .../recipes/siltstone_relief_sword.json | 18 +- .../recipes/siltstone_relief_vertical.json | 18 +- .../mineralogy/recipes/siltstone_slab.json | 14 +- ...tone_slab_from_siltstone_stonecutting.json | 14 - .../mineralogy/recipes/siltstone_smooth.json | 19 +- .../recipes/siltstone_smooth_brick.json | 20 +- .../siltstone_smooth_brick_furnace.json | 31 +- .../recipes/siltstone_smooth_brick_slab.json | 22 +- .../siltstone_smooth_brick_stairs.json | 24 +- .../recipes/siltstone_smooth_brick_wall.json | 24 +- .../recipes/siltstone_smooth_furnace.json | 27 +- .../recipes/siltstone_smooth_slab.json | 18 +- .../recipes/siltstone_smooth_stairs.json | 20 +- .../recipes/siltstone_smooth_wall.json | 20 +- .../mineralogy/recipes/siltstone_stairs.json | 16 +- ...ne_stairs_from_siltstone_stonecutting.json | 14 - .../mineralogy/recipes/siltstone_wall.json | 16 +- ...tone_wall_from_siltstone_stonecutting.json | 14 - .../data/mineralogy/recipes/slate_brick.json | 16 +- .../recipes/slate_brick_block_polishing.json | 25 + .../recipes/slate_brick_furnace.json | 27 +- .../mineralogy/recipes/slate_brick_slab.json | 18 +- .../recipes/slate_brick_slab_polishing.json | 25 + .../slate_brick_slab_recombination.json | 25 + .../recipes/slate_brick_stairs.json | 20 +- .../recipes/slate_brick_stairs_polishing.json | 25 + .../mineralogy/recipes/slate_brick_wall.json | 20 +- .../recipes/slate_brick_wall_polishing.json | 25 + .../mineralogy/recipes/slate_cobblestone.json | 5 +- .../mineralogy/recipes/slate_furnace.json | 23 +- .../recipes/slate_furnace_from_rock.json | 26 - ...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 | 18 +- .../recipes/slate_relief_blank.json | 18 +- .../recipes/slate_relief_cross.json | 18 +- .../recipes/slate_relief_hammer.json | 18 +- .../mineralogy/recipes/slate_relief_hoe.json | 18 +- .../recipes/slate_relief_horizontal.json | 18 +- .../mineralogy/recipes/slate_relief_i.json | 18 +- .../mineralogy/recipes/slate_relief_left.json | 18 +- .../recipes/slate_relief_pickaxe.json | 18 +- .../mineralogy/recipes/slate_relief_plus.json | 18 +- .../recipes/slate_relief_right.json | 34 +- .../recipes/slate_relief_sword.json | 18 +- .../recipes/slate_relief_vertical.json | 18 +- .../data/mineralogy/recipes/slate_slab.json | 14 +- .../slate_slab_from_slate_stonecutting.json | 14 - .../data/mineralogy/recipes/slate_smooth.json | 19 +- .../recipes/slate_smooth_brick.json | 20 +- .../recipes/slate_smooth_brick_furnace.json | 31 +- .../recipes/slate_smooth_brick_slab.json | 22 +- .../recipes/slate_smooth_brick_stairs.json | 24 +- .../recipes/slate_smooth_brick_wall.json | 24 +- .../recipes/slate_smooth_furnace.json | 27 +- .../mineralogy/recipes/slate_smooth_slab.json | 18 +- .../recipes/slate_smooth_stairs.json | 20 +- .../mineralogy/recipes/slate_smooth_wall.json | 20 +- .../data/mineralogy/recipes/slate_stairs.json | 16 +- .../slate_stairs_from_slate_stonecutting.json | 14 - .../data/mineralogy/recipes/slate_wall.json | 16 +- .../slate_wall_from_slate_stonecutting.json | 14 - .../data/mineralogy/recipes/sulfur_block.json | 39 +- .../data/mineralogy/recipes/sulfur_dust.json | 30 +- .../data/mineralogy/recipes/tuff_brick.json | 16 +- .../recipes/tuff_brick_block_polishing.json | 25 + .../recipes/tuff_brick_furnace.json | 27 +- .../mineralogy/recipes/tuff_brick_slab.json | 18 +- .../recipes/tuff_brick_slab_polishing.json | 25 + .../tuff_brick_slab_recombination.json | 25 + .../mineralogy/recipes/tuff_brick_stairs.json | 20 +- .../recipes/tuff_brick_stairs_polishing.json | 25 + .../mineralogy/recipes/tuff_brick_wall.json | 20 +- .../recipes/tuff_brick_wall_polishing.json | 25 + .../mineralogy/recipes/tuff_cobblestone.json | 5 +- .../data/mineralogy/recipes/tuff_furnace.json | 23 +- .../recipes/tuff_furnace_from_rock.json | 26 - ...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 | 18 +- .../mineralogy/recipes/tuff_relief_blank.json | 18 +- .../mineralogy/recipes/tuff_relief_cross.json | 18 +- .../recipes/tuff_relief_hammer.json | 18 +- .../mineralogy/recipes/tuff_relief_hoe.json | 18 +- .../recipes/tuff_relief_horizontal.json | 18 +- .../mineralogy/recipes/tuff_relief_i.json | 18 +- .../mineralogy/recipes/tuff_relief_left.json | 18 +- .../recipes/tuff_relief_pickaxe.json | 18 +- .../mineralogy/recipes/tuff_relief_plus.json | 18 +- .../mineralogy/recipes/tuff_relief_right.json | 34 +- .../mineralogy/recipes/tuff_relief_sword.json | 18 +- .../recipes/tuff_relief_vertical.json | 18 +- .../data/mineralogy/recipes/tuff_slab.json | 14 +- .../tuff_slab_from_tuff_stonecutting.json | 14 - .../data/mineralogy/recipes/tuff_smooth.json | 19 +- .../mineralogy/recipes/tuff_smooth_brick.json | 20 +- .../recipes/tuff_smooth_brick_furnace.json | 31 +- .../recipes/tuff_smooth_brick_slab.json | 22 +- .../recipes/tuff_smooth_brick_stairs.json | 24 +- .../recipes/tuff_smooth_brick_wall.json | 24 +- .../recipes/tuff_smooth_furnace.json | 27 +- .../mineralogy/recipes/tuff_smooth_slab.json | 18 +- .../recipes/tuff_smooth_stairs.json | 20 +- .../mineralogy/recipes/tuff_smooth_wall.json | 20 +- .../data/mineralogy/recipes/tuff_stairs.json | 16 +- .../tuff_stairs_from_tuff_stonecutting.json | 14 - .../data/mineralogy/recipes/tuff_wall.json | 16 +- .../tuff_wall_from_tuff_stonecutting.json | 14 - .../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 | 7 - .../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 + 3269 files changed, 72435 insertions(+), 26402 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/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/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 (90%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/blocks/Chert.java (67%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/blocks/DoubleSlab.java (65%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/blocks/DryWall.java (94%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/blocks/Gypsum.java (91%) 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%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/blocks/RockFurnace.java (98%) 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%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/blocks/RockSaltLamp.java (93%) 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 (98%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/blocks/RockStairs.java (95%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/blocks/RockWall.java (95%) 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 (76%) 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 (70%) rename src/main/java/{com/mcmoddev => zone/moddev/mc}/mineralogy/init/MineralogyItemGroups.java (71%) 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 (84%) 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 (93%) 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 (93%) 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 (94%) 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 (86%) 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.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 delete mode 100644 src/main/resources/data/mineralogy/recipes/gunpowder_from_carbon.json create mode 100644 src/main/resources/data/mineralogy/recipes/gunpowder_from_carbon_dust.json create mode 100644 src/main/resources/data/mineralogy/recipes/gunpowder_from_charcoal.json 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 a60a5af62..46cf6f250 100644 --- a/build.gradle +++ b/build.gradle @@ -1,174 +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}" - -java.toolchain.languageVersion = JavaLanguageVersion.of(8) // Mojang ships Java 8 to end users, so your mod should target Java 8. +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: 'snapshot', version: project.mcp_mappings_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 91cee2f38..26bebe54b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,8 +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=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 -mod_version=5.2.1 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 e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..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 59203 zcma&O1CT9Y(k9%tZQHhO+qUh#ZQHhO+qmuS+qP|E@9xZO?0h@l{(r>DQ>P;GjjD{w zH}lENr;dU&FbEU?00aa80D$0M0RRB{U*7-#kbjS|qAG&4l5%47zyJ#WrfA#1$1Ctx zf&Z_d{GW=lf^w2#qRJ|CvSJUi(^E3iv~=^Z(zH}F)3Z%V3`@+rNB7gTVU{Bb~90p|f+0(v;nz01EG7yDMX9@S~__vVgv%rS$+?IH+oZ03D5zYrv|^ zC1J)SruYHmCki$jLBlTaE5&dFG9-kq3!^i>^UQL`%gn6)jz54$WDmeYdsBE9;PqZ_ zoGd=P4+|(-u4U1dbAVQrFWoNgNd;0nrghPFbQrJctO>nwDdI`Q^i0XJDUYm|T|RWc zZ3^Qgo_Qk$%Fvjj-G}1NB#ZJqIkh;kX%V{THPqOyiq)d)0+(r9o(qKlSp*hmK#iIY zA^)Vr$-Hz<#SF=0@tL@;dCQsm`V9s1vYNq}K1B)!XSK?=I1)tX+bUV52$YQu*0%fnWEukW>mxkz+%3-S!oguE8u#MGzST8_Dy^#U?fA@S#K$S@9msUiX!gd_ow>08w5)nX{-KxqMOo7d?k2&?Vf z&diGDtZr(0cwPe9z9FAUSD9KC)7(n^lMWuayCfxzy8EZsns%OEblHFSzP=cL6}?J| z0U$H!4S_TVjj<`6dy^2j`V`)mC;cB%* z8{>_%E1^FH!*{>4a7*C1v>~1*@TMcLK{7nEQ!_igZC}ikJ$*<$yHy>7)oy79A~#xE zWavoJOIOC$5b6*q*F_qN1>2#MY)AXVyr$6x4b=$x^*aqF*L?vmj>Mgv+|ITnw_BoW zO?jwHvNy^prH{9$rrik1#fhyU^MpFqF2fYEt(;4`Q&XWOGDH8k6M=%@fics4ajI;st# zCU^r1CK&|jzUhRMv;+W~6N;u<;#DI6cCw-otsc@IsN3MoSD^O`eNflIoR~l4*&-%RBYk@gb^|-JXs&~KuSEmMxB}xSb z@K76cXD=Y|=I&SNC2E+>Zg?R6E%DGCH5J1nU!A|@eX9oS(WPaMm==k2s_ueCqdZw| z&hqHp)47`c{BgwgvY2{xz%OIkY1xDwkw!<0veB#yF4ZKJyabhyyVS`gZepcFIk%e2 zTcrmt2@-8`7i-@5Nz>oQWFuMC_KlroCl(PLSodswHqJ3fn<;gxg9=}~3x_L3P`9Sn zChIf}8vCHvTriz~T2~FamRi?rh?>3bX1j}%bLH+uFX+p&+^aXbOK7clZxdU~6Uxgy z8R=obwO4dL%pmVo*Ktf=lH6hnlz_5k3cG;m8lgaPp~?eD!Yn2kf)tU6PF{kLyn|oI@eQ`F z3IF7~Blqg8-uwUuWZScRKn%c2_}dXB6Dx_&xR*n9M9LXasJhtZdr$vBY!rP{c@=)& z#!?L$2UrkvClwQO>U*fSMs67oSj2mxiJ$t;E|>q%Kh_GzzWWO&3;ufU%2z%ucBU8H z3WIwr$n)cfCXR&>tyB7BcSInK>=ByZA%;cVEJhcg<#6N{aZC4>K41XF>ZgjG`z_u& zGY?;Ad?-sgiOnI`oppF1o1Gurqbi*;#x2>+SSV6|1^G@ooVy@fg?wyf@0Y!UZ4!}nGuLeC^l)6pwkh|oRY`s1Pm$>zZ3u-83T|9 zGaKJIV3_x+u1>cRibsaJpJqhcm%?0-L;2 zitBrdRxNmb0OO2J%Y&Ym(6*`_P3&&5Bw157{o7LFguvxC$4&zTy#U=W*l&(Q2MNO} zfaUwYm{XtILD$3864IA_nn34oVa_g^FRuHL5wdUd)+W-p-iWCKe8m_cMHk+=? zeKX)M?Dt(|{r5t7IenkAXo%&EXIb-i^w+0CX0D=xApC=|Xy(`xy+QG^UyFe z+#J6h_&T5i#sV)hj3D4WN%z;2+jJcZxcI3*CHXGmOF3^)JD5j&wfX)e?-|V0GPuA+ zQFot%aEqGNJJHn$!_}#PaAvQ^{3-Ye7b}rWwrUmX53(|~i0v{}G_sI9uDch_brX&6 zWl5Ndj-AYg(W9CGfQf<6!YmY>Ey)+uYd_JNXH=>|`OH-CDCmcH(0%iD_aLlNHKH z7bcW-^5+QV$jK?R*)wZ>r9t}loM@XN&M-Pw=F#xn(;u3!(3SXXY^@=aoj70;_=QE9 zGghsG3ekq#N||u{4We_25U=y#T*S{4I{++Ku)> zQ!DZW;pVcn>b;&g2;YE#+V`v*Bl&Y-i@X6D*OpNA{G@JAXho&aOk(_j^weW{#3X5Y z%$q_wpb07EYPdmyH(1^09i$ca{O<}7) zRWncXdSPgBE%BM#by!E>tdnc$8RwUJg1*x($6$}ae$e9Knj8gvVZe#bLi!<+&BkFj zg@nOpDneyc+hU9P-;jmOSMN|*H#>^Ez#?;%C3hg_65leSUm;iz)UkW)jX#p)e&S&M z1|a?wDzV5NVnlhRBCd_;F87wp>6c<&nkgvC+!@KGiIqWY4l}=&1w7|r6{oBN8xyzh zG$b#2=RJp_iq6)#t5%yLkKx(0@D=C3w+oiXtSuaQ%I1WIb-eiE$d~!)b@|4XLy!CZ z9p=t=%3ad@Ep+<9003D2KZ5VyP~_n$=;~r&YUg5UZ0KVD&tR1DHy9x)qWtKJp#Kq# zP*8p#W(8JJ_*h_3W}FlvRam?<4Z+-H77^$Lvi+#vmhL9J zJ<1SV45xi;SrO2f=-OB(7#iNA5)x1uNC-yNxUw|!00vcW2PufRm>e~toH;M0Q85MQLWd?3O{i8H+5VkR@l9Dg-ma ze2fZ%>G(u5(k9EHj2L6!;(KZ8%8|*-1V|B#EagbF(rc+5iL_5;Eu)L4Z-V;0HfK4d z*{utLse_rvHZeQ>V5H=f78M3Ntg1BPxFCVD{HbNA6?9*^YIq;B-DJd{Ca2L#)qWP? zvX^NhFmX?CTWw&Ns}lgs;r3i+Bq@y}Ul+U%pzOS0Fcv9~aB(0!>GT0)NO?p=25LjN z2bh>6RhgqD7bQj#k-KOm@JLgMa6>%-ok1WpOe)FS^XOU{c?d5shG(lIn3GiVBxmg`u%-j=)^v&pX1JecJics3&jvPI)mDut52? z3jEA)DM%}BYbxxKrizVYwq?(P&19EXlwD9^-6J+4!}9{ywR9Gk42jjAURAF&EO|~N z)?s>$Da@ikI4|^z0e{r`J8zIs>SpM~Vn^{3fArRu;?+43>lD+^XtUcY1HidJwnR6+ z!;oG2=B6Z_=M%*{z-RaHc(n|1RTKQdNjjV!Pn9lFt^4w|AeN06*j}ZyhqZ^!-=cyGP_ShV1rGxkx8t zB;8`h!S{LD%ot``700d0@Grql(DTt4Awgmi+Yr0@#jbe=2#UkK%rv=OLqF)9D7D1j z!~McAwMYkeaL$~kI~90)5vBhBzWYc3Cj1WI0RS`z000R8-@ET0dA~*r(gSiCJmQMN&4%1D zyVNf0?}sBH8zNbBLn>~(W{d3%@kL_eQ6jEcR{l>C|JK z(R-fA!z|TTRG40|zv}7E@PqCAXP3n`;%|SCQ|ZS%ym$I{`}t3KPL&^l5`3>yah4*6 zifO#{VNz3)?ZL$be;NEaAk9b#{tV?V7 zP|wf5YA*1;s<)9A4~l3BHzG&HH`1xNr#%){4xZ!jq%o=7nN*wMuXlFV{HaiQLJ`5G zBhDi#D(m`Q1pLh@Tq+L;OwuC52RdW7b8}~60WCOK5iYMUad9}7aWBuILb({5=z~YF zt?*Jr5NG+WadM{mDL>GyiByCuR)hd zA=HM?J6l1Xv0Dl+LW@w$OTcEoOda^nFCw*Sy^I@$sSuneMl{4ys)|RY#9&NxW4S)9 zq|%83IpslTLoz~&vTo!Ga@?rj_kw{|k{nv+w&Ku?fyk4Ki4I?);M|5Axm)t+BaE)D zm(`AQ#k^DWrjbuXoJf2{Aj^KT zFb1zMSqxq|vceV+Mf-)$oPflsO$@*A0n0Z!R{&(xh8s}=;t(lIy zv$S8x>m;vQNHuRzoaOo?eiWFe{0;$s`Bc+Osz~}Van${u;g(su`3lJ^TEfo~nERfP z)?aFzpDgnLYiERsKPu|0tq4l2wT)Atr6Qb%m-AUn6HnCue*yWICp7TjW$@sO zm5rm4aTcPQ(rfi7a`xP7cKCFrJD}*&_~xgLyr^-bmsL}y;A5P|al8J3WUoBSjqu%v zxC;mK!g(7r6RRJ852Z~feoC&sD3(6}^5-uLK8o)9{8L_%%rItZK9C){UxB|;G>JbP zsRRtS4-3B*5c+K2kvmgZK8472%l>3cntWUOVHxB|{Ay~aOg5RN;{PJgeVD*H%ac+y!h#wi%o2bF2Ca8IyMyH{>4#{E_8u^@+l-+n=V}Sq?$O z{091@v%Bd*3pk0^2UtiF9Z+(a@wy6 zUdw8J*ze$K#=$48IBi1U%;hmhO>lu!uU;+RS}p&6@rQila7WftH->*A4=5W|Fmtze z)7E}jh@cbmr9iup^i%*(uF%LG&!+Fyl@LFA-}Ca#bxRfDJAiR2dt6644TaYw1Ma79 zt8&DYj31j^5WPNf5P&{)J?WlCe@<3u^78wnd(Ja4^a>{^Tw}W>|Cjt^If|7l^l)^Q zbz|7~CF(k_9~n|h;ysZ+jHzkXf(*O*@5m zLzUmbHp=x!Q|!9NVXyipZ3)^GuIG$k;D)EK!a5=8MFLI_lpf`HPKl=-Ww%z8H_0$j ztJ||IfFG1lE9nmQ0+jPQy zCBdKkjArH@K7jVcMNz);Q(Q^R{d5G?-kk;Uu_IXSyWB)~KGIizZL(^&qF;|1PI7!E zTP`%l)gpX|OFn&)M%txpQ2F!hdA~hX1Cm5)IrdljqzRg!f{mN%G~H1&oqe`5eJCIF zHdD7O;AX-{XEV(a`gBFJ9ews#CVS2y!&>Cm_dm3C8*n3MA*e67(WC?uP@8TXuMroq z{#w$%z@CBIkRM7?}Xib+>hRjy?%G!fiw8! z8(gB+8J~KOU}yO7UGm&1g_MDJ$IXS!`+*b*QW2x)9>K~Y*E&bYMnjl6h!{17_8d!%&9D`a7r&LKZjC<&XOvTRaKJ1 zUY@hl5^R&kZl3lU3njk`3dPzxj$2foOL26r(9zsVF3n_F#v)s5vv3@dgs|lP#eylq62{<-vczqP!RpVBTgI>@O6&sU>W|do17+#OzQ7o5A$ICH z?GqwqnK^n2%LR;$^oZM;)+>$X3s2n}2jZ7CdWIW0lnGK-b#EG01)P@aU`pg}th&J-TrU`tIpb5t((0eu|!u zQz+3ZiOQ^?RxxK4;zs=l8q!-n7X{@jSwK(iqNFiRColuEOg}!7cyZi`iBX4g1pNBj zAPzL?P^Ljhn;1$r8?bc=#n|Ed7wB&oHcw()&*k#SS#h}jO?ZB246EGItsz*;^&tzp zu^YJ0=lwsi`eP_pU8}6JA7MS;9pfD;DsSsLo~ogzMNP70@@;Fm8f0^;>$Z>~}GWRw!W5J3tNX*^2+1f3hz{~rIzJo z6W%J(H!g-eI_J1>0juX$X4Cl6i+3wbc~k146UIX&G22}WE>0ga#WLsn9tY(&29zBvH1$`iWtTe zG2jYl@P!P)eb<5DsR72BdI7-zP&cZNI{7q3e@?N8IKc4DE#UVr->|-ryuJXk^u^>4 z$3wE~=q390;XuOQP~TNoDR?#|NSPJ%sTMInA6*rJ%go|=YjGe!B>z6u$IhgQSwoV* zjy3F2#I>uK{42{&IqP59)Y(1*Z>>#W8rCf4_eVsH)`v!P#^;BgzKDR`ARGEZzkNX+ zJUQu=*-ol=Xqqt5=`=pA@BIn@6a9G8C{c&`i^(i+BxQO9?YZ3iu%$$da&Kb?2kCCo zo7t$UpSFWqmydXf@l3bVJ=%K?SSw)|?srhJ-1ZdFu*5QhL$~-IQS!K1s@XzAtv6*Y zl8@(5BlWYLt1yAWy?rMD&bwze8bC3-GfNH=p zynNFCdxyX?K&G(ZZ)afguQ2|r;XoV^=^(;Cku#qYn4Lus`UeKt6rAlFo_rU`|Rq z&G?~iWMBio<78of-2X(ZYHx~=U0Vz4btyXkctMKdc9UM!vYr~B-(>)(Hc|D zMzkN4!PBg%tZoh+=Gba!0++d193gbMk2&krfDgcbx0jI92cq?FFESVg0D$>F+bil} zY~$)|>1HZsX=5sAZ2WgPB5P=8X#TI+NQ(M~GqyVB53c6IdX=k>Wu@A0Svf5#?uHaF zsYn|koIi3$(%GZ2+G+7Fv^lHTb#5b8sAHSTnL^qWZLM<(1|9|QFw9pnRU{svj}_Al zL)b9>fN{QiA($8peNEJyy`(a{&uh-T4_kdZFIVsKKVM(?05}76EEz?#W za^fiZOAd14IJ4zLX-n7Lq0qlQ^lW8Cvz4UKkV9~P}>sq0?xD3vg+$4vLm~C(+ zM{-3Z#qnZ09bJ>}j?6ry^h+@PfaD7*jZxBEY4)UG&daWb??6)TP+|3#Z&?GL?1i+280CFsE|vIXQbm| zM}Pk!U`U5NsNbyKzkrul-DzwB{X?n3E6?TUHr{M&+R*2%yOiXdW-_2Yd6?38M9Vy^ z*lE%gA{wwoSR~vN0=no}tP2Ul5Gk5M(Xq`$nw#ndFk`tcpd5A=Idue`XZ!FS>Q zG^0w#>P4pPG+*NC9gLP4x2m=cKP}YuS!l^?sHSFftZy{4CoQrb_ z^20(NnG`wAhMI=eq)SsIE~&Gp9Ne0nD4%Xiu|0Fj1UFk?6avDqjdXz{O1nKao*46y zT8~iA%Exu=G#{x=KD;_C&M+Zx4+n`sHT>^>=-1YM;H<72k>$py1?F3#T1*ef9mLZw z5naLQr?n7K;2l+{_uIw*_1nsTn~I|kkCgrn;|G~##hM;9l7Jy$yJfmk+&}W@JeKcF zx@@Woiz8qdi|D%aH3XTx5*wDlbs?dC1_nrFpm^QbG@wM=i2?Zg;$VK!c^Dp8<}BTI zyRhAq@#%2pGV49*Y5_mV4+OICP|%I(dQ7x=6Ob}>EjnB_-_18*xrY?b%-yEDT(wrO z9RY2QT0`_OpGfMObKHV;QLVnrK%mc?$WAdIT`kJQT^n%GuzE7|9@k3ci5fYOh(287 zuIbg!GB3xLg$YN=n)^pHGB0jH+_iIiC=nUcD;G6LuJsjn2VI1cyZx=a?ShCsF==QK z;q~*m&}L<-cb+mDDXzvvrRsybcgQ;Vg21P(uLv5I+eGc7o7tc6`;OA9{soHFOz zT~2?>Ts}gprIX$wRBb4yE>ot<8+*Bv`qbSDv*VtRi|cyWS>)Fjs>fkNOH-+PX&4(~ z&)T8Zam2L6puQl?;5zg9h<}k4#|yH9czHw;1jw-pwBM*O2hUR6yvHATrI%^mvs9q_ z&ccT0>f#eDG<^WG^q@oVqlJrhxH)dcq2cty@l3~|5#UDdExyXUmLQ}f4#;6fI{f^t zDCsgIJ~0`af%YR%Ma5VQq-p21k`vaBu6WE?66+5=XUd%Ay%D$irN>5LhluRWt7 zov-=f>QbMk*G##&DTQyou$s7UqjjW@k6=!I@!k+S{pP8R(2=e@io;N8E`EOB;OGoI zw6Q+{X1_I{OO0HPpBz!X!@`5YQ2)t{+!?M_iH25X(d~-Zx~cXnS9z>u?+If|iNJbx zyFU2d1!ITX64D|lE0Z{dLRqL1Ajj=CCMfC4lD3&mYR_R_VZ>_7_~|<^o*%_&jevU+ zQ4|qzci=0}Jydw|LXLCrOl1_P6Xf@c0$ieK2^7@A9UbF{@V_0p%lqW|L?5k>bVM8|p5v&2g;~r>B8uo<4N+`B zH{J)h;SYiIVx@#jI&p-v3dwL5QNV1oxPr8J%ooezTnLW>i*3Isb49%5i!&ac_dEXv zvXmVUck^QHmyrF8>CGXijC_R-y(Qr{3Zt~EmW)-nC!tiH`wlw5D*W7Pip;T?&j%kX z6DkZX4&}iw>hE(boLyjOoupf6JpvBG8}jIh!!VhnD0>}KSMMo{1#uU6kiFcA04~|7 zVO8eI&x1`g4CZ<2cYUI(n#wz2MtVFHx47yE5eL~8bot~>EHbevSt}LLMQX?odD{Ux zJMnam{d)W4da{l7&y-JrgiU~qY3$~}_F#G7|MxT)e;G{U`In&?`j<5D->}cb{}{T(4DF0BOk-=1195KB-E*o@c?`>y#4=dMtYtSY=&L{!TAjFVcq0y@AH`vH! z$41+u!Ld&}F^COPgL(EE{0X7LY&%D7-(?!kjFF7=qw<;`V{nwWBq<)1QiGJgUc^Vz ztMUlq1bZqKn17|6x6iAHbWc~l1HcmAxr%$Puv!znW)!JiukwIrqQ00|H$Z)OmGG@= zv%A8*4cq}(?qn4rN6o`$Y))(MyXr8R<2S^J+v(wmFmtac!%VOfN?&(8Nr!T@kV`N; z*Q33V3t`^rN&aBiHet)18wy{*wi1=W!B%B-Q6}SCrUl$~Hl{@!95ydml@FK8P=u4s z4e*7gV2s=YxEvskw2Ju!2%{8h01rx-3`NCPc(O zH&J0VH5etNB2KY6k4R@2Wvl^Ck$MoR3=)|SEclT2ccJ!RI9Nuter7u9@;sWf-%um;GfI!=eEIQ2l2p_YWUd{|6EG ze{yO6;lMc>;2tPrsNdi@&1K6(1;|$xe8vLgiouj%QD%gYk`4p{Ktv9|j+!OF-P?@p z;}SV|oIK)iwlBs+`ROXkhd&NK zzo__r!B>tOXpBJMDcv!Mq54P+n4(@dijL^EpO1wdg~q+!DT3lB<>9AANSe!T1XgC=J^)IP0XEZ()_vpu!!3HQyJhwh?r`Ae%Yr~b% zO*NY9t9#qWa@GCPYOF9aron7thfWT`eujS4`t2uG6)~JRTI;f(ZuoRQwjZjp5Pg34 z)rp$)Kr?R+KdJ;IO;pM{$6|2y=k_siqvp%)2||cHTe|b5Ht8&A{wazGNca zX$Ol?H)E_R@SDi~4{d-|8nGFhZPW;Cts1;08TwUvLLv&_2$O6Vt=M)X;g%HUr$&06 zISZb(6)Q3%?;3r~*3~USIg=HcJhFtHhIV(siOwV&QkQe#J%H9&E21!C*d@ln3E@J* zVqRO^<)V^ky-R|%{(9`l-(JXq9J)1r$`uQ8a}$vr9E^nNiI*thK8=&UZ0dsFN_eSl z(q~lnD?EymWLsNa3|1{CRPW60>DSkY9YQ;$4o3W7Ms&@&lv9eH!tk~N&dhqX&>K@} zi1g~GqglxkZ5pEFkllJ)Ta1I^c&Bt6#r(QLQ02yHTaJB~- zCcE=5tmi`UA>@P=1LBfBiqk)HB4t8D?02;9eXj~kVPwv?m{5&!&TFYhu>3=_ zsGmYZ^mo*-j69-42y&Jj0cBLLEulNRZ9vXE)8~mt9C#;tZs;=#M=1*hebkS;7(aGf zcs7zH(I8Eui9UU4L--))yy`&d&$In&VA2?DAEss4LAPCLd>-$i?lpXvn!gu^JJ$(DoUlc6wE98VLZ*z`QGQov5l4Fm_h?V-;mHLYDVOwKz7>e4+%AzeO>P6v}ndPW| zM>m#6Tnp7K?0mbK=>gV}=@k*0Mr_PVAgGMu$j+pWxzq4MAa&jpCDU&-5eH27Iz>m^ zax1?*HhG%pJ((tkR(V(O(L%7v7L%!_X->IjS3H5kuXQT2!ow(;%FDE>16&3r){!ex zhf==oJ!}YU89C9@mfDq!P3S4yx$aGB?rbtVH?sHpg?J5C->!_FHM%Hl3#D4eplxzQ zRA+<@LD%LKSkTk2NyWCg7u=$%F#;SIL44~S_OGR}JqX}X+=bc@swpiClB`Zbz|f!4 z7Ysah7OkR8liXfI`}IIwtEoL}(URrGe;IM8%{>b1SsqXh)~w}P>yiFRaE>}rEnNkT z!HXZUtxUp1NmFm)Dm@-{FI^aRQqpSkz}ZSyKR%Y}YHNzBk)ZIp} zMtS=aMvkgWKm9&oTcU0?S|L~CDqA+sHpOxwnswF-fEG)cXCzUR?ps@tZa$=O)=L+5 zf%m58cq8g_o}3?Bhh+c!w4(7AjxwQ3>WnVi<{{38g7yFboo>q|+7qs<$8CPXUFAN< zG&}BHbbyQ5n|qqSr?U~GY{@GJ{(Jny{bMaOG{|IkUj7tj^9pa9|FB_<+KHLxSxR;@ zHpS$4V)PP+tx}22fWx(Ku9y+}Ap;VZqD0AZW4gCDTPCG=zgJmF{|x;(rvdM|2|9a}cex6xrMkERnkE;}jvU-kmzd%_J50$M`lIPCKf+^*zL=@LW`1SaEc%=m zQ+lT06Gw+wVwvQ9fZ~#qd430v2HndFsBa9WjD0P}K(rZYdAt^5WQIvb%D^Q|pkVE^ zte$&#~zmULFACGfS#g=2OLOnIf2Of-k!(BIHjs77nr!5Q1*I9 z1%?=~#Oss!rV~?-6Gm~BWJiA4mJ5TY&iPm_$)H1_rTltuU1F3I(qTQ^U$S>%$l z)Wx1}R?ij0idp@8w-p!Oz{&*W;v*IA;JFHA9%nUvVDy7Q8woheC#|8QuDZb-L_5@R zOqHwrh|mVL9b=+$nJxM`3eE{O$sCt$UK^2@L$R(r^-_+z?lOo+me-VW=Zw z-Bn>$4ovfWd%SPY`ab-u9{INc*k2h+yH%toDHIyqQ zO68=u`N}RIIs7lsn1D){)~%>ByF<>i@qFb<-axvu(Z+6t7v<^z&gm9McRB~BIaDn$ z#xSGT!rzgad8o>~kyj#h1?7g96tOcCJniQ+*#=b7wPio>|6a1Z?_(TS{)KrPe}(8j z!#&A=k(&Pj^F;r)CI=Z{LVu>uj!_W1q4b`N1}E(i%;BWjbEcnD=mv$FL$l?zS6bW!{$7j1GR5ocn94P2u{ z70tAAcpqtQo<@cXw~@i-@6B23;317|l~S>CB?hR5qJ%J3EFgyBdJd^fHZu7AzHF(BQ!tyAz^L0`X z23S4Fe{2X$W0$zu9gm%rg~A>ijaE#GlYlrF9$ds^QtaszE#4M(OLVP2O-;XdT(XIC zatwzF*)1c+t~c{L=fMG8Z=k5lv>U0;C{caN1NItnuSMp)6G3mbahu>E#sj&oy94KC zpH}8oEw{G@N3pvHhp{^-YaZeH;K+T_1AUv;IKD<=mv^&Ueegrb!yf`4VlRl$M?wsl zZyFol(2|_QM`e_2lYSABpKR{{NlxlDSYQNkS;J66aT#MSiTx~;tUmvs-b*CrR4w=f z8+0;*th6kfZ3|5!Icx3RV11sp=?`0Jy3Fs0N4GZQMN=8HmT6%x9@{Dza)k}UwL6JT zHRDh;%!XwXr6yuuy`4;Xsn0zlR$k%r%9abS1;_v?`HX_hI|+EibVnlyE@3aL5vhQq zlIG?tN^w@0(v9M*&L+{_+RQZw=o|&BRPGB>e5=ys7H`nc8nx)|-g;s7mRc7hg{GJC zAe^vCIJhajmm7C6g! zL&!WAQ~5d_5)00?w_*|*H>3$loHrvFbitw#WvLB!JASO?#5Ig5$Ys10n>e4|3d;tS zELJ0|R4n3Az(Fl3-r^QiV_C;)lQ1_CW{5bKS15U|E9?ZgLec@%kXr84>5jV2a5v=w z?pB1GPdxD$IQL4)G||B_lI+A=08MUFFR4MxfGOu07vfIm+j=z9tp~5i_6jb`tR>qV z$#`=BQ*jpCjm$F0+F)L%xRlnS%#&gro6PiRfu^l!EVan|r3y}AHJQOORGx4~ z&<)3=K-tx518DZyp%|!EqpU!+X3Et7n2AaC5(AtrkW>_57i}$eqs$rupubg0a1+WO zGHZKLN2L0D;ab%{_S1Plm|hx8R?O14*w*f&2&bB050n!R2by zw!@XOQx$SqZ5I<(Qu$V6g>o#A!JVwErWv#(Pjx=KeS0@hxr4?13zj#oWwPS(7Ro|v z>Mp@Kmxo79q|}!5qtX2-O@U&&@6s~!I&)1WQIl?lTnh6UdKT_1R640S4~f=_xoN3- zI+O)$R@RjV$F=>Ti7BlnG1-cFKCC(t|Qjm{SalS~V-tX#+2ekRhwmN zZr`8{QF6y~Z!D|{=1*2D-JUa<(1Z=;!Ei!KiRNH?o{p5o3crFF=_pX9O-YyJchr$~ zRC`+G+8kx~fD2k*ZIiiIGR<8r&M@3H?%JVOfE>)})7ScOd&?OjgAGT@WVNSCZ8N(p zuQG~76GE3%(%h1*vUXg$vH{ua0b`sQ4f0*y=u~lgyb^!#CcPJa2mkSEHGLsnO^kb$ zru5_l#nu=Y{rSMWiYx?nO{8I!gH+?wEj~UM?IrG}E|bRIBUM>UlY<`T1EHpRr36vv zBi&dG8oxS|J$!zoaq{+JpJy+O^W(nt*|#g32bd&K^w-t>!Vu9N!k9eA8r!Xc{utY> zg9aZ(D2E0gL#W0MdjwES-7~Wa8iubPrd?8-$C4BP?*wok&O8+ykOx{P=Izx+G~hM8 z*9?BYz!T8~dzcZr#ux8kS7u7r@A#DogBH8km8Ry4slyie^n|GrTbO|cLhpqgMdsjX zJ_LdmM#I&4LqqsOUIXK8gW;V0B(7^$y#h3h>J0k^WJfAMeYek%Y-Dcb_+0zPJez!GM zAmJ1u;*rK=FNM0Nf}Y!!P9c4)HIkMnq^b;JFd!S3?_Qi2G#LIQ)TF|iHl~WKK6JmK zbv7rPE6VkYr_%_BT}CK8h=?%pk@3cz(UrZ{@h40%XgThP*-Oeo`T0eq9 zA8BnWZKzCy5e&&_GEsU4*;_k}(8l_&al5K-V*BFM=O~;MgRkYsOs%9eOY6s6AtE*<7GQAR2ulC3RAJrG_P1iQK5Z~&B z&f8X<>yJV6)oDGIlS$Y*D^Rj(cszTy5c81a5IwBr`BtnC6_e`ArI8CaTX_%rx7;cn zR-0?J_LFg*?(#n~G8cXut(1nVF0Oka$A$1FGcERU<^ggx;p@CZc?3UB41RY+wLS`LWFNSs~YP zuw1@DNN3lTd|jDL7gjBsd9}wIw}4xT2+8dBQzI00m<@?c2L%>}QLfK5%r!a-iII`p zX@`VEUH)uj^$;7jVUYdADQ2k*!1O3WdfgF?OMtUXNpQ1}QINamBTKDuv19^{$`8A1 zeq%q*O0mi@(%sZU>Xdb0Ru96CFqk9-L3pzLVsMQ`Xpa~N6CR{9Rm2)A|CI21L(%GW zh&)Y$BNHa=FD+=mBw3{qTgw)j0b!Eahs!rZnpu)z!!E$*eXE~##yaXz`KE5(nQM`s zD!$vW9XH)iMxu9R>r$VlLk9oIR%HxpUiW=BK@4U)|1WNQ=mz9a z^!KkO=>GaJ!GBXm{KJj^;kh-MkUlEQ%lza`-G&}C5y1>La1sR6hT=d*NeCnuK%_LV zOXt$}iP6(YJKc9j-Fxq~*ItVUqljQ8?oaysB-EYtFQp9oxZ|5m0^Hq(qV!S+hq#g( z?|i*H2MIr^Kxgz+3vIljQ*Feejy6S4v~jKEPTF~Qhq!(ms5>NGtRgO5vfPPc4Z^AM zTj!`5xEreIN)vaNxa|q6qWdg>+T`Ol0Uz)ckXBXEGvPNEL3R8hB3=C5`@=SYgAju1 z!)UBr{2~=~xa{b8>x2@C7weRAEuatC)3pkRhT#pMPTpSbA|tan%U7NGMvzmF?c!V8 z=pEWxbdXbTAGtWTyI?Fml%lEr-^AE}w#l(<7OIw;ctw}imYax&vR4UYNJZK6P7ZOd zP87XfhnUHxCUHhM@b*NbTi#(-8|wcv%3BGNs#zRCVV(W?1Qj6^PPQa<{yaBwZ`+<`w|;rqUY_C z&AeyKwwf*q#OW-F()lir=T^<^wjK65Lif$puuU5+tk$;e_EJ;Lu+pH>=-8=PDhkBg z8cWt%@$Sc#C6F$Vd+0507;{OOyT7Hs%nKS88q-W!$f~9*WGBpHGgNp}=C*7!RiZ5s zn1L_DbKF@B8kwhDiLKRB@lsXVVLK|ph=w%_`#owlf@s@V(pa`GY$8h%;-#h@TsO|Y8V=n@*!Rog7<7Cid%apR|x zOjhHCyfbIt%+*PCveTEcuiDi%Wx;O;+K=W?OFUV%)%~6;gl?<0%)?snDDqIvkHF{ zyI02)+lI9ov42^hL>ZRrh*HhjF9B$A@=H94iaBESBF=eC_KT$8A@uB^6$~o?3Wm5t1OIaqF^~><2?4e3c&)@wKn9bD? zoeCs;H>b8DL^F&>Xw-xjZEUFFTv>JD^O#1E#)CMBaG4DX9bD(Wtc8Rzq}9soQ8`jf zeSnHOL}<+WVSKp4kkq&?SbETjq6yr@4%SAqOG=9E(3YeLG9dtV+8vmzq+6PFPk{L; z(&d++iu=^F%b+ea$i2UeTC{R*0Isk;vFK!no<;L+(`y`3&H-~VTdKROkdyowo1iqR zbVW(3`+(PQ2>TKY>N!jGmGo7oeoB8O|P_!Ic@ zZ^;3dnuXo;WJ?S+)%P>{Hcg!Jz#2SI(s&dY4QAy_vRlmOh)QHvs_7c&zkJCmJGVvV zX;Mtb>QE+xp`KyciG$Cn*0?AK%-a|=o!+7x&&yzHQOS>8=B*R=niSnta^Pxp1`=md z#;$pS$4WCT?mbiCYU?FcHGZ#)kHVJTTBt^%XE(Q};aaO=Zik0UgLcc0I(tUpt(>|& zcxB_|fxCF7>&~5eJ=Dpn&5Aj{A^cV^^}(7w#p;HG&Q)EaN~~EqrE1qKrMAc&WXIE;>@<&)5;gD2?={Xf@Mvn@OJKw=8Mgn z!JUFMwD+s==JpjhroT&d{$kQAy%+d`a*XxDEVxy3`NHzmITrE`o!;5ClXNPb4t*8P zzAivdr{j_v!=9!^?T3y?gzmqDWX6mkzhIzJ-3S{T5bcCFMr&RPDryMcdwbBuZbsgN zGrp@^i?rcfN7v0NKGzDPGE#4yszxu=I_`MI%Z|10nFjU-UjQXXA?k8Pk|OE<(?ae) zE%vG#eZAlj*E7_3dx#Zz4kMLj>H^;}33UAankJiDy5ZvEhrjr`!9eMD8COp}U*hP+ zF}KIYx@pkccIgyxFm#LNw~G&`;o&5)2`5aogs`1~7cMZQ7zj!%L4E`2yzlQN6REX20&O<9 zKV6fyr)TScJPPzNTC2gL+0x#=u>(({{D7j)c-%tvqls3#Y?Z1m zV5WUE)zdJ{$p>yX;^P!UcXP?UD~YM;IRa#Rs5~l+*$&nO(;Ers`G=0D!twR(0GF@c zHl9E5DQI}Oz74n zfKP>&$q0($T4y$6w(p=ERAFh+>n%iaeRA%!T%<^+pg?M)@ucY<&59$x9M#n+V&>}=nO9wCV{O~lg&v#+jcUj(tQ z`0u1YH)-`U$15a{pBkGyPL0THv1P|4e@pf@3IBZS4dVJPo#H>pWq%Lr0YS-SeWash z8R7=jb28KPMI|_lo#GEO|5B?N_e``H*23{~a!AmUJ+fb4HX-%QI@lSEUxKlGV7z7Q zSKw@-TR>@1RL%w{x}dW#k1NgW+q4yt2Xf1J62Bx*O^WG8OJ|FqI4&@d3_o8Id@*)4 zYrk=>@!wv~mh7YWv*bZhxqSmFh2Xq)o=m;%n$I?GSz49l1$xRpPu_^N(vZ>*>Z<04 z2+rP70oM=NDysd!@fQdM2OcyT?3T^Eb@lIC-UG=Bw{BjQ&P`KCv$AcJ;?`vdZ4){d z&gkoUK{$!$$K`3*O-jyM1~p-7T*qb)Ys>Myt^;#1&a%O@x8A+E>! zY8=eD`ZG)LVagDLBeHg>=atOG?Kr%h4B%E6m@J^C+U|y)XX@f z8oyJDW|9g=<#f<{JRr{y#~euMnv)`7j=%cHWLc}ngjq~7k**6%4u>Px&W%4D94(r* z+akunK}O0DC2A%Xo9jyF;DobX?!1I(7%}@7F>i%&nk*LMO)bMGg2N+1iqtg+r(70q zF5{Msgsm5GS7DT`kBsjMvOrkx&|EU!{{~gL4d2MWrAT=KBQ-^zQCUq{5PD1orxlIL zq;CvlWx#f1NWvh`hg011I%?T_s!e38l*lWVt|~z-PO4~~1g)SrJ|>*tXh=QfXT)%( z+ex+inPvD&O4Ur;JGz>$sUOnWdpSLcm1X%aQDw4{dB!cnj`^muI$CJ2%p&-kULVCE z>$eMR36kN$wCPR+OFDM3-U(VOrp9k3)lI&YVFqd;Kpz~K)@Fa&FRw}L(SoD z9B4a+hQzZT-BnVltst&=kq6Y(f^S4hIGNKYBgMxGJ^;2yrO}P3;r)(-I-CZ)26Y6? z&rzHI_1GCvGkgy-t1E;r^3Le30|%$ebDRu2+gdLG)r=A~Qz`}~&L@aGJ{}vVs_GE* zVUjFnzHiXfKQbpv&bR&}l2bzIjAooB)=-XNcYmrGmBh(&iu@o!^hn0^#}m2yZZUK8 zufVm7Gq0y`Mj;9b>`c?&PZkU0j4>IL=UL&-Lp3j&47B5pAW4JceG{!XCA)kT<%2nqCxj<)uy6XR_uws~>_MEKPOpAQ!H zkn>FKh)<9DwwS*|Y(q?$^N!6(51O0 z^JM~Ax{AI1Oj$fs-S5d4T7Z_i1?{%0SsIuQ&r8#(JA=2iLcTN+?>wOL532%&dMYkT z*T5xepC+V6zxhS@vNbMoi|i)=rpli@R9~P!39tWbSSb904ekv7D#quKbgFEMTb48P zuq(VJ+&L8aWU(_FCD$3^uD!YM%O^K(dvy~Wm2hUuh6bD|#(I39Xt>N1Y{ZqXL`Fg6 zKQ?T2htHN!(Bx;tV2bfTtIj7e)liN-29s1kew>v(D^@)#v;}C4-G=7x#;-dM4yRWm zyY`cS21ulzMK{PoaQ6xChEZ}o_#}X-o}<&0)$1#3we?+QeLt;aVCjeA)hn!}UaKt< zat1fHEx13y-rXNMvpUUmCVzocPmN~-Y4(YJvQ#db)4|%B!rBsgAe+*yor~}FrNH08 z3V!97S}D7d$zbSD{$z;@IYMxM6aHdypIuS*pr_U6;#Y!_?0i|&yU*@16l z*dcMqDQgfNBf}?quiu4e>H)yTVfsp#f+Du0@=Kc41QockXkCkvu>FBd6Q+@FL!(Yx z2`YuX#eMEiLEDhp+9uFqME_E^faV&~9qjBHJkIp~%$x^bN=N)K@kvSVEMdDuzA0sn z88CBG?`RX1@#hQNd`o^V{37)!w|nA)QfiYBE^m=yQKv-fQF+UCMcuEe1d4BH7$?>b zJl-r9@0^Ie=)guO1vOd=i$_4sz>y3x^R7n4ED!5oXL3@5**h(xr%Hv)_gILarO46q+MaDOF%ChaymKoI6JU5Pg;7#2n9-18|S1;AK+ zgsn6;k6-%!QD>D?cFy}8F;r@z8H9xN1jsOBw2vQONVqBVEbkiNUqgw~*!^##ht>w0 zUOykwH=$LwX2j&nLy=@{hr)2O&-wm-NyjW7n~Zs9UlH;P7iP3 zI}S(r0YFVYacnKH(+{*)Tbw)@;6>%=&Th=+Z6NHo_tR|JCI8TJiXv2N7ei7M^Q+RM z?9o`meH$5Yi;@9XaNR#jIK^&{N|DYNNbtdb)XW1Lv2k{E>;?F`#Pq|&_;gm~&~Zc9 zf+6ZE%{x4|{YdtE?a^gKyzr}dA>OxQv+pq|@IXL%WS0CiX!V zm$fCePA%lU{%pTKD7|5NJHeXg=I0jL@$tOF@K*MI$)f?om)D63K*M|r`gb9edD1~Y zc|w7N)Y%do7=0{RC|AziW7#am$)9jciRJ?IWl9PE{G3U+$%FcyKs_0Cgq`=K3@ttV z9g;M!3z~f_?P%y3-ph%vBMeS@p7P&Ea8M@97+%XEj*(1E6vHj==d zjsoviB>j^$_^OI_DEPvFkVo(BGRo%cJeD){6Uckei=~1}>sp299|IRjhXe)%?uP0I zF5+>?0#Ye}T^Y$u_rc4=lPcq4K^D(TZG-w30-YiEM=dcK+4#o*>lJ8&JLi+3UcpZk z!^?95S^C0ja^jwP`|{<+3cBVog$(mRdQmadS+Vh~z zS@|P}=|z3P6uS+&@QsMp0no9Od&27O&14zHXGAOEy zh~OKpymK5C%;LLb467@KgIiVwYbYd6wFxI{0-~MOGfTq$nBTB!{SrWmL9Hs}C&l&l#m?s*{tA?BHS4mVKHAVMqm63H<|c5n0~k)-kbg zXidai&9ZUy0~WFYYKT;oe~rytRk?)r8bptITsWj(@HLI;@=v5|XUnSls7$uaxFRL+ zRVMGuL3w}NbV1`^=Pw*0?>bm8+xfeY(1PikW*PB>>Tq(FR`91N0c2&>lL2sZo5=VD zQY{>7dh_TX98L2)n{2OV=T10~*YzX27i2Q7W86M4$?gZIXZaBq#sA*{PH8){|GUi;oM>e?ua7eF4WFuFYZSG| zze?srg|5Ti8Og{O zeFxuw9!U+zhyk?@w zjsA6(oKD=Ka;A>Ca)oPORxK+kxH#O@zhC!!XS4@=swnuMk>t+JmLmFiE^1aX3f<)D@`%K0FGK^gg1a1j>zi z2KhV>sjU7AX3F$SEqrXSC}fRx64GDoc%!u2Yag68Lw@w9v;xOONf@o)Lc|Uh3<21ctTYu-mFZuHk*+R{GjXHIGq3p)tFtQp%TYqD=j1&y)>@zxoxUJ!G@ zgI0XKmP6MNzw>nRxK$-Gbzs}dyfFzt>#5;f6oR27ql!%+{tr+(`(>%51|k`ML} zY4eE)Lxq|JMas(;JibNQds1bUB&r}ydMQXBY4x(^&fY_&LlQC)3hylc$~8&~|06-D z#T+%66rYbHX%^KuqJED_wuGB+=h`nWA!>1n0)3wZrBG3%`b^Ozv6__dNa@%V14|!D zQ?o$z5u0^8`giv%qE!BzZ!3j;BlDlJDk)h@9{nSQeEk!z9RGW) z${RSF3phEM*ce*>Xdp}585vj$|40=&S{S-GTiE?Op*vY&Lvr9}BO$XWy80IF+6@%n z5*2ueT_g@ofP#u5pxb7n*fv^Xtt7&?SRc{*2Ka-*!BuOpf}neHGCiHy$@Ka1^Dint z;DkmIL$-e)rj4o2WQV%Gy;Xg(_Bh#qeOsTM2f@KEe~4kJ8kNLQ+;(!j^bgJMcNhvklP5Z6I+9Fq@c&D~8Fb-4rmDT!MB5QC{Dsb;BharP*O;SF4& zc$wj-7Oep7#$WZN!1nznc@Vb<_Dn%ga-O#J(l=OGB`dy=Sy&$(5-n3zzu%d7E#^8`T@}V+5B;PP8J14#4cCPw-SQTdGa2gWL0*zKM z#DfSXs_iWOMt)0*+Y>Lkd=LlyoHjublNLefhKBv@JoC>P7N1_#> zv=mLWe96%EY;!ZGSQDbZWb#;tzqAGgx~uk+-$+2_8U`!ypbwXl z^2E-FkM1?lY@yt8=J3%QK+xaZ6ok=-y%=KXCD^0r!5vUneW>95PzCkOPO*t}p$;-> ze5j-BLT_;)cZQzR2CEsm@rU7GZfFtdp*a|g4wDr%8?2QkIGasRfDWT-Dvy*U{?IHT z*}wGnzdlSptl#ZF^sf)KT|BJs&kLG91^A6ls{CzFprZ6-Y!V0Xysh%9p%iMd7HLsS zN+^Un$tDV)T@i!v?3o0Fsx2qI(AX_$dDkBzQ@fRM%n zRXk6hb9Py#JXUs+7)w@eo;g%QQ95Yq!K_d=z{0dGS+pToEI6=Bo8+{k$7&Z zo4>PH(`ce8E-Ps&uv`NQ;U$%t;w~|@E3WVOCi~R4oj5wP?%<*1C%}Jq%a^q~T7u>K zML5AKfQDv6>PuT`{SrKHRAF+^&edg6+5R_#H?Lz3iGoWo#PCEd0DS;)2U({{X#zU^ zw_xv{4x7|t!S)>44J;KfA|DC?;uQ($l+5Vp7oeqf7{GBF9356nx|&B~gs+@N^gSdd zvb*>&W)|u#F{Z_b`f#GVtQ`pYv3#||N{xj1NgB<#=Odt6{eB%#9RLt5v zIi|0u70`#ai}9fJjKv7dE!9ZrOIX!3{$z_K5FBd-Kp-&e4(J$LD-)NMTp^_pB`RT; zftVVlK2g@+1Ahv2$D){@Y#cL#dUj9*&%#6 zd2m9{1NYp>)6=oAvqdCn5#cx{AJ%S8skUgMglu2*IAtd+z1>B&`MuEAS(D(<6X#Lj z?f4CFx$)M&$=7*>9v1ER4b6!SIz-m0e{o0BfkySREchp?WdVPpQCh!q$t>?rL!&Jg zd#heM;&~A}VEm8Dvy&P|J*eAV&w!&Nx6HFV&B8jJFVTmgLaswn!cx$&%JbTsloz!3 zMEz1d`k==`Ueub_JAy_&`!ogbwx27^ZXgFNAbx=g_I~5nO^r)}&myw~+yY*cJl4$I znNJ32M&K=0(2Dj_>@39`3=FX!v3nZHno_@q^!y}%(yw0PqOo=);6Y@&ylVe>nMOZ~ zd>j#QQSBn3oaWd;qy$&5(5H$Ayi)0haAYO6TH>FR?rhqHmNOO+(})NB zLI@B@v0)eq!ug`>G<@htRlp3n!EpU|n+G+AvXFrWSUsLMBfL*ZB`CRsIVHNTR&b?K zxBgsN0BjfB>UVcJ|x%=-zb%OV7lmZc& zxiupadZVF7)6QuhoY;;FK2b*qL0J-Rn-8!X4ZY$-ZSUXV5DFd7`T41c(#lAeLMoeT z4%g655v@7AqT!i@)Edt5JMbN(=Q-6{=L4iG8RA%}w;&pKmtWvI4?G9pVRp|RTw`g0 zD5c12B&A2&P6Ng~8WM2eIW=wxd?r7A*N+&!Be7PX3s|7~z=APxm=A?5 zt>xB4WG|*Td@VX{Rs)PV0|yK`oI3^xn(4c_j&vgxk_Y3o(-`_5o`V zRTghg6%l@(qodXN;dB#+OKJEEvhfcnc#BeO2|E(5df-!fKDZ!%9!^BJ_4)9P+9Dq5 zK1=(v?KmIp34r?z{NEWnLB3Px{XYwy-akun4F7xTRr2^zeYW{gcK9)>aJDdU5;w5@ zak=<+-PLH-|04pelTb%ULpuuuJC7DgyT@D|p{!V!0v3KpDnRjANN12q6SUR3mb9<- z>2r~IApQGhstZ!3*?5V z8#)hJ0TdZg0M-BK#nGFP>$i=qk82DO z7h;Ft!D5E15OgW)&%lej*?^1~2=*Z5$2VX>V{x8SC+{i10BbtUk9@I#Vi&hX)q
Q!LwySI{Bnv%Sm)yh{^sSVJ8&h_D-BJ_YZe5eCaAWU9b$O2c z$T|{vWVRtOL!xC0DTc(Qbe`ItNtt5hr<)VijD0{U;T#bUEp381_y`%ZIav?kuYG{iyYdEBPW=*xNSc;Rlt6~F4M`5G+VtOjc z*0qGzCb@gME5udTjJA-9O<&TWd~}ysBd(eVT1-H82-doyH9RST)|+Pb{o*;$j9Tjs zhU!IlsPsj8=(x3bAKJTopW3^6AKROHR^7wZ185wJGVhA~hEc|LP;k7NEz-@4p5o}F z`AD6naG3(n=NF9HTH81=F+Q|JOz$7wm9I<+#BSmB@o_cLt2GkW9|?7mM;r!JZp89l zbo!Hp8=n!XH1{GwaDU+k)pGp`C|cXkCU5%vcH)+v@0eK>%7gWxmuMu9YLlChA|_D@ zi#5zovN_!a-0?~pUV-Rj*1P)KwdU-LguR>YM&*Nen+ln8Q$?WFCJg%DY%K}2!!1FE zDv-A%Cbwo^p(lzac&_TZ-l#9kq`mhLcY3h9ZTUVCM(Ad&=EriQY5{jJv<5K&g|*Lk zgV%ILnf1%8V2B0E&;Sp4sYbYOvvMebLwYwzkRQ#F8GpTQq#uv=J`uaSJ34OWITeSGo6+-8Xw znCk*n{kdDEi)Hi&u^)~cs@iyCkFWB2SWZU|Uc%^43ZIZQ-vWNExCCtDWjqHs;;tWf$v{}0{p0Rvxkq``)*>+Akq%|Na zA`@~-Vfe|+(AIlqru+7Ceh4nsVmO9p9jc8}HX^W&ViBDXT+uXbT#R#idPn&L>+#b6 zflC-4C5-X;kUnR~L>PSLh*gvL68}RBsu#2l`s_9KjUWRhiqF`j)`y`2`YU(>3bdBj z?>iyjEhe-~$^I5!nn%B6Wh+I`FvLNvauve~eX<+Ipl&04 zT}};W&1a3%W?dJ2=N#0t?e+aK+%t}5q%jSLvp3jZ%?&F}nOOWr>+{GFIa%wO_2`et z=JzoRR~}iKuuR+azPI8;Gf9)z3kyA4EIOSl!sRR$DlW}0>&?GbgPojmjmnln;cTqCt=ADbE zZ8GAnoM+S1(5$i8^O4t`ue;vO4i}z0wz-QEIVe5_u03;}-!G1NyY8;h^}y;tzY}i5 zqQr#Ur3Fy8sSa$Q0ys+f`!`+>9WbvU_I`Sj;$4{S>O3?#inLHCrtLy~!s#WXV=oVP zeE93*Nc`PBi4q@%Ao$x4lw9vLHM!6mn3-b_cebF|n-2vt-zYVF_&sDE--J-P;2WHo z+@n2areE0o$LjvjlV2X7ZU@j+`{*8zq`JR3gKF#EW|#+{nMyo-a>nFFTg&vhyT=b} zDa8+v0(Dgx0yRL@ZXOYIlVSZ0|MFizy0VPW8;AfA5|pe!#j zX}Py^8fl5SyS4g1WSKKtnyP+_PoOwMMwu`(i@Z)diJp~U54*-miOchy7Z35eL>^M z4p<-aIxH4VUZgS783@H%M7P9hX>t{|RU7$n4T(brCG#h9e9p! z+o`i;EGGq3&pF;~5V~eBD}lC)>if$w%Vf}AFxGqO88|ApfHf&Bvu+xdG)@vuF}Yvk z)o;~k-%+0K0g+L`Wala!$=ZV|z$e%>f0%XoLib%)!R^RoS+{!#X?h-6uu zF&&KxORdZU&EwQFITIRLo(7TA3W}y6X{?Y%y2j0It!ekU#<)$qghZtpcS>L3uh`Uj z7GY;6f$9qKynP#oS3$$a{p^{D+0oJQ71`1?OAn_m8)UGZmj3l*ZI)`V-a>MKGGFG< z&^jg#Ok%(hhm>hSrZ5;Qga4u(?^i>GiW_j9%_7M>j(^|Om$#{k+^*ULnEgzW_1gCICtAD^WpC`A z{9&DXkG#01Xo)U$OC(L5Y$DQ|Q4C6CjUKk1UkPj$nXH##J{c8e#K|&{mA*;b$r0E4 zUNo0jthwA(c&N1l=PEe8Rw_8cEl|-eya9z&H3#n`B$t#+aJ03RFMzrV@gowbe8v(c zIFM60^0&lCFO10NU4w@|61xiZ4CVXeaKjd;d?sv52XM*lS8XiVjgWpRB;&U_C0g+`6B5V&w|O6B*_q zsATxL!M}+$He)1eOWECce#eS@2n^xhlB4<_Nn?yCVEQWDs(r`|@2GqLe<#(|&P0U? z$7V5IgpWf09uIf_RazRwC?qEqRaHyL?iiS05UiGesJy%^>-C{{ypTBI&B0-iUYhk> zIk<5xpsuV@g|z(AZD+C-;A!fTG=df1=<%nxy(a(IS+U{ME4ZbDEBtcD_3V=icT6*_ z)>|J?>&6%nvHhZERBtjK+s4xnut*@>GAmA5m*OTp$!^CHTr}vM4n(X1Q*;{e-Rd2BCF-u@1ZGm z!S8hJ6L=Gl4T_SDa7Xx|-{4mxveJg=ctf`BJ*fy!yF6Dz&?w(Q_6B}WQVtNI!BVBC zKfX<>7vd6C96}XAQmF-Jd?1Q4eTfRB3q7hCh0f!(JkdWT5<{iAE#dKy*Jxq&3a1@~ z8C||Dn2mFNyrUV|<-)C^_y7@8c2Fz+2jrae9deBDu;U}tJ{^xAdxCD248(k;dCJ%o z`y3sADe>U%suxwwv~8A1+R$VB=Q?%U?4joI$um;aH+eCrBqpn- z%79D_7rb;R-;-9RTrwi9dPlg8&@tfWhhZ(Vx&1PQ+6(huX`;M9x~LrW~~#3{j0Bh2kDU$}@!fFQej4VGkJv?M4rU^x!RU zEwhu$!CA_iDjFjrJa`aocySDX16?~;+wgav;}Zut6Mg%C4>}8FL?8)Kgwc(Qlj{@#2Pt0?G`$h7P#M+qoXtlV@d}%c&OzO+QYKK`kyXaK{U(O^2DyIXCZlNQjt0^8~8JzNGrIxhj}}M z&~QZlbx%t;MJ(Vux;2tgNKGlAqphLq%pd}JG9uoVHUo?|hN{pLQ6Em%r*+7t^<);X zm~6=qChlNAVXNN*Sow->*4;}T;l;D1I-5T{Bif@4_}=>l`tK;qqDdt5zvisCKhMAH z#r}`)7VW?LZqfdmXQ%zo5bJ00{Xb9^YKrk0Nf|oIW*K@(=`o2Vndz}ZDyk{!u}PVx zzd--+_WC*U{~DH3{?GI64IB+@On&@9X>EUAo&L+G{L^dozaI4C3G#2wr~hseW@K&g zKWs{uHu-9Je!3;4pE>eBltKUXb^*hG8I&413)$J&{D4N%7PcloU6bn%jPxJyQL?g* z9g+YFFEDiE`8rW^laCNzQmi7CTnPfwyg3VDHRAl>h=In6jeaVOP@!-CP60j3+#vpL zEYmh_oP0{-gTe7Or`L6x)6w?77QVi~jD8lWN@3RHcm80iV%M1A!+Y6iHM)05iC64tb$X2lV_%Txk@0l^hZqi^%Z?#- zE;LE0uFx)R08_S-#(wC=dS&}vj6P4>5ZWjhthP=*Hht&TdLtKDR;rXEX4*z0h74FA zMCINqrh3Vq;s%3MC1YL`{WjIAPkVL#3rj^9Pj9Ss7>7duy!9H0vYF%>1jh)EPqvlr6h%R%CxDsk| z!BACz7E%j?bm=pH6Eaw{+suniuY7C9Ut~1cWfOX9KW9=H><&kQlinPV3h9R>3nJvK z4L9(DRM=x;R&d#a@oFY7mB|m8h4692U5eYfcw|QKwqRsshN(q^v$4$)HgPpAJDJ`I zkqjq(8Cd!K!+wCd=d@w%~e$=gdUgD&wj$LQ1r>-E=O@c ze+Z$x{>6(JA-fNVr)X;*)40Eym1TtUZI1Pwwx1hUi+G1Jlk~vCYeXMNYtr)1?qwyg zsX_e*$h?380O00ou?0R@7-Fc59o$UvyVs4cUbujHUA>sH!}L54>`e` zHUx#Q+Hn&Og#YVOuo*niy*GU3rH;%f``nk#NN5-xrZ34NeH$l`4@t);4(+0|Z#I>Y z)~Kzs#exIAaf--65L0UHT_SvV8O2WYeD>Mq^Y6L!Xu8%vnpofG@w!}R7M28?i1*T&zp3X4^OMCY6(Dg<-! zXmcGQrRgHXGYre7GfTJ)rhl|rs%abKT_Nt24_Q``XH{88NVPW+`x4ZdrMuO0iZ0g` z%p}y};~T5gbb9SeL8BSc`SO#ixC$@QhXxZ=B}L`tP}&k?1oSPS=4%{UOHe0<_XWln zwbl5cn(j-qK`)vGHY5B5C|QZd5)W7c@{bNVXqJ!!n$^ufc?N9C-BF2QK1(kv++h!>$QbAjq)_b$$PcJdV+F7hz0Hu@ zqj+}m0qn{t^tD3DfBb~0B36|Q`bs*xs|$i^G4uNUEBl4g;op-;Wl~iThgga?+dL7s zUP(8lMO?g{GcYpDS{NM!UA8Hco?#}eNEioRBHy4`mq!Pd-9@-97|k$hpEX>xoX+dY zDr$wfm^P&}Wu{!%?)U_(%Mn79$(ywvu*kJ9r4u|MyYLI_67U7%6Gd_vb##Nerf@>& z8W11z$$~xEZt$dPG}+*IZky+os5Ju2eRi;1=rUEeIn>t-AzC_IGM-IXWK3^6QNU+2pe=MBn4I*R@A%-iLDCOHTE-O^wo$sL_h{dcPl=^muAQb`_BRm};=cy{qSkui;`WSsj9%c^+bIDQ z0`_?KX0<-=o!t{u(Ln)v>%VGL z0pC=GB7*AQ?N7N{ut*a%MH-tdtNmNC+Yf$|KS)BW(gQJ*z$d{+{j?(e&hgTy^2|AR9vx1Xre2fagGv0YXWqtNkg*v%40v?BJBt|f9wX5 z{QTlCM}b-0{mV?IG>TW_BdviUKhtosrBqdfq&Frdz>cF~yK{P@(w{Vr7z2qKFwLhc zQuogKO@~YwyS9%+d-zD7mJG~@?EFJLSn!a&mhE5$_4xBl&6QHMzL?CdzEnC~C3$X@ zvY!{_GR06ep5;<#cKCSJ%srxX=+pn?ywDwtJ2{TV;0DKBO2t++B(tIO4)Wh`rD13P z4fE$#%zkd=UzOB74gi=-*CuID&Z3zI^-`4U^S?dHxK8fP*;fE|a(KYMgMUo`THIS1f!*6dOI2 zFjC3O=-AL`6=9pp;`CYPTdVX z8(*?V&%QoipuH0>WKlL8A*zTKckD!paN@~hh zmXzm~qZhMGVdQGd=AG8&20HW0RGV8X{$9LldFZYm zE?}`Q3i?xJRz43S?VFMmqRyvWaS#(~Lempg9nTM$EFDP(Gzx#$r)W&lpFKqcAoJh-AxEw$-bjW>`_+gEi z2w`99#UbFZGiQjS8kj~@PGqpsPX`T{YOj`CaEqTFag;$jY z8_{Wzz>HXx&G*Dx<5skhpETxIdhKH?DtY@b9l8$l?UkM#J-Snmts7bd7xayKTFJ(u zyAT&@6cAYcs{PBfpqZa%sxhJ5nSZBPji?Zlf&}#L?t)vC4X5VLp%~fz2Sx<*oN<7` z?ge=k<=X7r<~F7Tvp9#HB{!mA!QWBOf%EiSJ6KIF8QZNjg&x~-%e*tflL(ji_S^sO ztmib1rp09uon}RcsFi#k)oLs@$?vs(i>5k3YN%$T(5Or(TZ5JW9mA6mIMD08=749$ z!d+l*iu{Il7^Yu}H;lgw=En1sJpCKPSqTCHy4(f&NPelr31^*l%KHq^QE>z>Ks_bH zjbD?({~8Din7IvZeJ>8Ey=e;I?thpzD=zE5UHeO|neioJwG;IyLk?xOz(yO&0DTU~ z^#)xcs|s>Flgmp;SmYJ4g(|HMu3v7#;c*Aa8iF#UZo7CvDq4>8#qLJ|YdZ!AsH%^_7N1IQjCro

K7UpUK$>l@ zw`1S}(D?mUXu_C{wupRS-jiX~w=Uqqhf|Vb3Cm9L=T+w91Cu^ z*&Ty%sN?x*h~mJc4g~k{xD4ZmF%FXZNC;oVDwLZ_WvrnzY|{v8hc1nmx4^}Z;yriXsAf+Lp+OFLbR!&Ox?xABwl zu8w&|5pCxmu#$?Cv2_-Vghl2LZ6m7}VLEfR5o2Ou$x02uA-%QB2$c(c1rH3R9hesc zfpn#oqpbKuVsdfV#cv@5pV4^f_!WS+F>SV6N0JQ9E!T90EX((_{bSSFv9ld%I0&}9 zH&Jd4MEX1e0iqDtq~h?DBrxQX1iI0lIs<|kB$Yrh&cpeK0-^K%=FBsCBT46@h#yi!AyDq1V(#V}^;{{V*@T4WJ&U-NTq43w=|K>z8%pr_nC>%C(Wa_l78Ufib$r8Od)IIN=u>417 z`Hl{9A$mI5A(;+-Q&$F&h-@;NR>Z<2U;Y21>>Z;s@0V@SbkMQQj%_;~+qTuQ?c|AV zcWm3XZQHhP&R%QWarS%mJ!9R^&!_)*s(v+VR@I#QrAT}`17Y+l<`b-nvmDNW`De%y zrwTZ9EJrj1AFA>B`1jYDow}~*dfPs}IZMO3=a{Fy#IOILc8F0;JS4x(k-NSpbN@qM z`@aE_e}5{!$v3+qVs7u?sOV(y@1Os*Fgu`fCW9=G@F_#VQ%xf$hj0~wnnP0$hFI+@ zkQj~v#V>xn)u??YutKsX>pxKCl^p!C-o?+9;!Nug^ z{rP!|+KsP5%uF;ZCa5F;O^9TGac=M|=V z_H(PfkV1rz4jl?gJ(ArXMyWT4y(86d3`$iI4^l9`vLdZkzpznSd5Ikfrs8qcSy&>z zTIZgWZGXw0n9ibQxYWE@gI0(3#KA-dAdPcsL_|hg2@~C!VZDM}5;v_Nykfq!*@*Zf zE_wVgx82GMDryKO{U{D>vSzSc%B~|cjDQrt5BN=Ugpsf8H8f1lR4SGo#hCuXPL;QQ z#~b?C4MoepT3X`qdW2dNn& zo8)K}%Lpu>0tQei+{>*VGErz|qjbK#9 zvtd8rcHplw%YyQCKR{kyo6fgg!)6tHUYT(L>B7er5)41iG`j$qe*kSh$fY!PehLcD zWeKZHn<492B34*JUQh=CY1R~jT9Jt=k=jCU2=SL&&y5QI2uAG2?L8qd2U(^AW#{(x zThSy=C#>k+QMo^7caQcpU?Qn}j-`s?1vXuzG#j8(A+RUAY})F@=r&F(8nI&HspAy4 z4>(M>hI9c7?DCW8rw6|23?qQMSq?*Vx?v30U%luBo)B-k2mkL)Ljk5xUha3pK>EEj z@(;tH|M@xkuN?gsz;*bygizwYR!6=(Xgcg^>WlGtRYCozY<rFX2E>kaZo)O<^J7a`MX8Pf`gBd4vrtD|qKn&B)C&wp0O-x*@-|m*0egT=-t@%dD zgP2D+#WPptnc;_ugD6%zN}Z+X4=c61XNLb7L1gWd8;NHrBXwJ7s0ce#lWnnFUMTR& z1_R9Fin4!d17d4jpKcfh?MKRxxQk$@)*hradH2$3)nyXep5Z;B z?yX+-Bd=TqO2!11?MDtG0n(*T^!CIiF@ZQymqq1wPM_X$Iu9-P=^}v7npvvPBu!d$ z7K?@CsA8H38+zjA@{;{kG)#AHME>Ix<711_iQ@WWMObXyVO)a&^qE1GqpP47Q|_AG zP`(AD&r!V^MXQ^e+*n5~Lp9!B+#y3#f8J^5!iC@3Y@P`;FoUH{G*pj*q7MVV)29+j z>BC`a|1@U_v%%o9VH_HsSnM`jZ-&CDvbiqDg)tQEnV>b%Ptm)T|1?TrpIl)Y$LnG_ zzKi5j2Fx^K^PG1=*?GhK;$(UCF-tM~^=Z*+Wp{FSuy7iHt9#4n(sUuHK??@v+6*|10Csdnyg9hAsC5_OrSL;jVkLlf zHXIPukLqbhs~-*oa^gqgvtpgTk_7GypwH><53riYYL*M=Q@F-yEPLqQ&1Sc zZB%w}T~RO|#jFjMWcKMZccxm-SL)s_ig?OC?y_~gLFj{n8D$J_Kw%{r0oB8?@dWzn zB528d-wUBQzrrSSLq?fR!K%59Zv9J4yCQhhDGwhptpA5O5U?Hjqt>8nOD zi{)0CI|&Gu%zunGI*XFZh(ix)q${jT8wnnzbBMPYVJc4HX*9d^mz|21$=R$J$(y7V zo0dxdbX3N#=F$zjstTf*t8vL)2*{XH!+<2IJ1VVFa67|{?LP&P41h$2i2;?N~RA30LV`BsUcj zfO9#Pg1$t}7zpv#&)8`mis3~o+P(DxOMgz-V*(?wWaxi?R=NhtW}<#^Z?(BhSwyar zG|A#Q7wh4OfK<|DAcl9THc-W4*>J4nTevsD%dkj`U~wSUCh15?_N@uMdF^Kw+{agk zJ`im^wDqj`Ev)W3k3stasP`88-M0ZBs7;B6{-tSm3>I@_e-QfT?7|n0D~0RRqDb^G zyHb=is;IwuQ&ITzL4KsP@Z`b$d%B0Wuhioo1CWttW8yhsER1ZUZzA{F*K=wmi-sb#Ju+j z-l@In^IKnb{bQG}Ps>+Vu_W#grNKNGto+yjA)?>0?~X`4I3T@5G1)RqGUZuP^NJCq&^HykuYtMDD8qq+l8RcZNJsvN(10{ zQ1$XcGt}QH-U^WU!-wRR1d--{B$%vY{JLWIV%P4-KQuxxDeJaF#{eu&&r!3Qu{w}0f--8^H|KwE>)ORrcR+2Qf zb})DRcH>k0zWK8@{RX}NYvTF;E~phK{+F;MkIP$)T$93Ba2R2TvKc>`D??#mv9wg$ zd~|-`Qx5LwwsZ2hb*Rt4S9dsF%Cny5<1fscy~)d;0m2r$f=83<->c~!GNyb!U)PA; zq^!`@@)UaG)Ew(9V?5ZBq#c%dCWZrplmuM`o~TyHjAIMh0*#1{B>K4po-dx$Tk-Cq z=WZDkP5x2W&Os`N8KiYHRH#UY*n|nvd(U>yO=MFI-2BEp?x@=N<~CbLJBf6P)}vLS?xJXYJ2^<3KJUdrwKnJnTp{ zjIi|R=L7rn9b*D#Xxr4*R<3T5AuOS+#U8hNlfo&^9JO{VbH!v9^JbK=TCGR-5EWR@ zN8T-_I|&@A}(hKeL4_*eb!1G8p~&_Im8|wc>Cdir+gg90n1dw?QaXcx6Op_W1r=axRw>4;rM*UOpT#Eb9xU1IiWo@h?|5uP zka>-XW0Ikp@dIe;MN8B01a7+5V@h3WN{J=HJ*pe0uwQ3S&MyWFni47X32Q7SyCTNQ z+sR!_9IZa5!>f&V$`q!%H8ci!a|RMx5}5MA_kr+bhtQy{-^)(hCVa@I!^TV4RBi zAFa!Nsi3y37I5EK;0cqu|9MRj<^r&h1lF}u0KpKQD^5Y+LvFEwM zLU@@v4_Na#Axy6tn3P%sD^5P#<7F;sd$f4a7LBMk zGU^RZHBcxSA%kCx*eH&wgA?Qwazm8>9SCSz_!;MqY-QX<1@p$*T8lc?@`ikEqJ>#w zcG``^CoFMAhdEXT9qt47g0IZkaU)4R7wkGs^Ax}usqJ5HfDYAV$!=6?>J6+Ha1I<5 z|6=9soU4>E))tW$<#>F ziZ$6>KJf0bPfbx_)7-}tMINlc=}|H+$uX)mhC6-Hz+XZxsKd^b?RFB6et}O#+>Wmw9Ec9) z{q}XFWp{3@qmyK*Jvzpyqv57LIR;hPXKsrh{G?&dRjF%Zt5&m20Ll?OyfUYC3WRn{cgQ?^V~UAv+5 z&_m#&nIwffgX1*Z2#5^Kl4DbE#NrD&Hi4|7SPqZ}(>_+JMz=s|k77aEL}<=0Zfb)a z%F(*L3zCA<=xO)2U3B|pcTqDbBoFp>QyAEU(jMu8(jLA61-H!ucI804+B!$E^cQQa z)_ERrW3g!B9iLb3nn3dlkvD7KsY?sRvls3QC0qPi>o<)GHx%4Xb$5a3GBTJ(k@`e@ z$RUa^%S15^1oLEmA=sayrP5;9qtf!Z1*?e$ORVPsXpL{jL<6E)0sj&swP3}NPmR%FM?O>SQgN5XfHE< zo(4#Cv11(%Nnw_{_Ro}r6=gKd{k?NebJ~<~Kv0r(r0qe4n3LFx$5%x(BKvrz$m?LG zjLIc;hbj0FMdb9aH9Lpsof#yG$(0sG2%RL;d(n>;#jb!R_+dad+K;Ccw!|RY?uS(a zj~?=&M!4C(5LnlH6k%aYvz@7?xRa^2gml%vn&eKl$R_lJ+e|xsNfXzr#xuh(>`}9g zLHSyiFwK^-p!;p$yt7$F|3*IfO3Mlu9e>Dpx8O`37?fA`cj`C0B-m9uRhJjs^mRp# zWB;Aj6|G^1V6`jg7#7V9UFvnB4((nIwG?k%c7h`?0tS8J3Bn0t#pb#SA}N-|45$-j z$R>%7cc2ebAClXc(&0UtHX<>pd)akR3Kx_cK+n<}FhzmTx!8e9^u2e4%x{>T6pQ`6 zO182bh$-W5A3^wos0SV_TgPmF4WUP-+D25KjbC{y_6W_9I2_vNKwU(^qSdn&>^=*t z&uvp*@c8#2*paD!ZMCi3;K{Na;I4Q35zw$YrW5U@Kk~)&rw;G?d7Q&c9|x<Hg|CNMsxovmfth*|E*GHezPTWa^Hd^F4!B3sF;)? z(NaPyAhocu1jUe(!5Cy|dh|W2=!@fNmuNOzxi^tE_jAtzNJ0JR-avc_H|ve#KO}#S z#a(8secu|^Tx553d4r@3#6^MHbH)vmiBpn0X^29xEv!Vuh1n(Sr5I0V&`jA2;WS|Y zbf0e}X|)wA-Pf5gBZ>r4YX3Mav1kKY(ulAJ0Q*jB)YhviHK)w!TJsi3^dMa$L@^{` z_De`fF4;M87vM3Ph9SzCoCi$#Fsd38u!^0#*sPful^p5oI(xGU?yeYjn;Hq1!wzFk zG&2w}W3`AX4bxoVm03y>ts{KaDf!}b&7$(P4KAMP=vK5?1In^-YYNtx1f#}+2QK@h zeSeAI@E6Z8a?)>sZ`fbq9_snl6LCu6g>o)rO;ijp3|$vig+4t} zylEo7$SEW<_U+qgVcaVhk+4k+C9THI5V10qV*dOV6pPtAI$)QN{!JRBKh-D zk2^{j@bZ}yqW?<#VVuI_27*cI-V~sJiqQv&m07+10XF+#ZnIJdr8t`9s_EE;T2V;B z4UnQUH9EdX%zwh-5&wflY#ve!IWt0UE-My3?L#^Bh%kcgP1q{&26eXLn zTkjJ*w+(|_>Pq0v8{%nX$QZbf)tbJaLY$03;MO=Ic-uqYUmUCuXD>J>o6BCRF=xa% z3R4SK9#t1!K4I_d>tZgE>&+kZ?Q}1qo4&h%U$GfY058s%*=!kac{0Z+4Hwm!)pFLR zJ+5*OpgWUrm0FPI2ib4NPJ+Sk07j(`diti^i#kh&f}i>P4~|d?RFb#!JN)~D@)beox}bw?4VCf^y*`2{4`-@%SFTry2h z>9VBc9#JxEs1+0i2^LR@B1J`B9Ac=#FW=(?2;5;#U$0E0UNag_!jY$&2diQk_n)bT zl5Me_SUvqUjwCqmVcyb`igygB_4YUB*m$h5oeKv3uIF0sk}~es!{D>4r%PC*F~FN3owq5e0|YeUTSG#Vq%&Gk7uwW z0lDo#_wvflqHeRm*}l?}o;EILszBt|EW*zNPmq#?4A+&i0xx^?9obLyY4xx=Y9&^G;xYXYPxG)DOpPg!i_Ccl#3L}6xAAZzNhPK1XaC_~ z!A|mlo?Be*8Nn=a+FhgpOj@G7yYs(Qk(8&|h@_>w8Y^r&5nCqe0V60rRz?b5%J;GYeBqSAjo|K692GxD4` zRZyM2FdI+-jK2}WAZTZ()w_)V{n5tEb@>+JYluDozCb$fA4H)$bzg(Ux{*hXurjO^ zwAxc+UXu=&JV*E59}h3kzQPG4M)X8E*}#_&}w*KEgtX)cU{vm9b$atHa;s>| z+L6&cn8xUL*OSjx4YGjf6{Eq+Q3{!ZyhrL&^6Vz@jGbI%cAM9GkmFlamTbcQGvOlL zmJ?(FI)c86=JEs|*;?h~o)88>12nXlpMR4@yh%qdwFNpct;vMlc=;{FSo*apJ;p}! zAX~t;3tb~VuP|ZW;z$=IHf->F@Ml)&-&Bnb{iQyE#;GZ@C$PzEf6~q}4D>9jic@mTO5x76ulDz@+XAcm35!VSu zT*Gs>;f0b2TNpjU_BjHZ&S6Sqk6V1370+!eppV2H+FY!q*n=GHQ!9Rn6MjY!Jc77A zG7Y!lFp8?TIHN!LXO?gCnsYM-gQxsm=Ek**VmZu7vnuufD7K~GIxfxbsQ@qv2T zPa`tvHB$fFCyZl>3oYg?_wW)C>^_iDOc^B7klnTOoytQH18WkOk)L2BSD0r%xgRSW zQS9elF^?O=_@|58zKLK;(f77l-Zzu}4{fXed2saq!5k#UZAoDBqYQS{sn@j@Vtp|$ zG%gnZ$U|9@u#w1@11Sjl8ze^Co=)7yS(}=;68a3~g;NDe_X^}yJj;~s8xq9ahQ5_r zxAlTMnep*)w1e(TG%tWsjo3RR;yVGPEO4V{Zp?=a_0R#=V^ioQu4YL=BO4r0$$XTX zZfnw#_$V}sDAIDrezGQ+h?q24St0QNug_?{s-pI(^jg`#JRxM1YBV;a@@JQvH8*>> zIJvku74E0NlXkYe_624>znU0J@L<-c=G#F3k4A_)*;ky!C(^uZfj%WB3-*{*B$?9+ zDm$WFp=0(xnt6`vDQV3Jl5f&R(Mp};;q8d3I%Kn>Kx=^;uSVCw0L=gw53%Bp==8Sw zxtx=cs!^-_+i{2OK`Q;913+AXc_&Z5$@z3<)So0CU3;JAv=H?@Zpi~riQ{z-zLtVL z!oF<}@IgJp)Iyz1zVJ42!SPHSkjYNS4%ulVVIXdRuiZ@5Mx8LJS}J#qD^Zi_xQ@>DKDr-_e#>5h3dtje*NcwH_h;i{Sx7}dkdpuW z(yUCjckQsagv*QGMSi9u1`Z|V^}Wjf7B@q%j2DQXyd0nOyqg%m{CK_lAoKlJ7#8M} z%IvR?Vh$6aDWK2W!=i?*<77q&B8O&3?zP(Cs@kapc)&p7En?J;t-TX9abGT#H?TW? ztO5(lPKRuC7fs}zwcUKbRh=7E8wzTsa#Z{a`WR}?UZ%!HohN}d&xJ=JQhpO1PI#>X zHkb>pW04pU%Bj_mf~U}1F1=wxdBZu1790>3Dm44bQ#F=T4V3&HlOLsGH)+AK$cHk6 zia$=$kog?)07HCL*PI6}DRhpM^*%I*kHM<#1Se+AQ!!xyhcy6j7`iDX7Z-2i73_n# zas*?7LkxS-XSqv;YBa zW_n*32D(HTYQ0$feV_Fru1ZxW0g&iwqixPX3=9t4o)o|kOo79V$?$uh?#8Q8e>4e)V6;_(x&ViUVxma+i25qea;d-oK7ouuDsB^ab{ zu1qjQ%`n56VtxBE#0qAzb7lph`Eb-}TYpXB!H-}3Ykqyp`otprp7{VEuW*^IR2n$Fb99*nAtqT&oOFIf z@w*6>YvOGw@Ja?Pp1=whZqydzx@9X4n^2!n83C5{C?G@|E?&$?p*g68)kNvUTJ)I6 z1Q|(#UuP6pj78GUxq11m-GSszc+)X{C2eo-?8ud9sB=3(D47v?`JAa{V(IF zPZQ_0AY*9M97>Jf<o%#O_%Wq}8>YM=q0|tGY+hlXcpE=Z4Od z`NT7Hu2hnvRoqOw@g1f=bv`+nba{GwA$Ak0INlqI1k<9!x_!sL()h?hEWoWrdU3w` zZ%%)VR+Bc@_v!C#koM1p-3v_^L6)_Ktj4HE>aUh%2XZE@JFMOn)J~c`_7VWNb9c-N z2b|SZMR4Z@E7j&q&9(6H3yjEu6HV7{2!1t0lgizD;mZ9$r(r7W5G$ky@w(T_dFnOD z*p#+z$@pKE+>o@%eT(2-p_C}wbQ5s(%Sn_{$HDN@MB+Ev?t@3dPy`%TZ!z}AThZSu zN<1i$siJhXFdjV zP*y|V<`V8t=h#XTRUR~5`c`Z9^-`*BZf?WAehGdg)E2Je)hqFa!k{V(u+(hTf^Yq& zoruUh2(^3pe)2{bvt4&4Y9CY3js)PUHtd4rVG57}uFJL)D(JfSIo^{P=7liFXG zq5yqgof0V8paQcP!gy+;^pp-DA5pj=gbMN0eW=-eY+N8~y+G>t+x}oa!5r>tW$xhI zPQSv=pi;~653Gvf6~*JcQ%t1xOrH2l3Zy@8AoJ+wz@daW@m7?%LXkr!bw9GY@ns3e zSfuWF_gkWnesv?s3I`@}NgE2xwgs&rj?kH-FEy82=O8`+szN ziHch`vvS`zNfap14!&#i9H@wF7}yIPm=UB%(o(}F{wsZ(wA0nJ2aD^@B41>>o-_U6 zUqD~vdo48S8~FTb^+%#zcbQiiYoDKYcj&$#^;Smmb+Ljp(L=1Kt_J!;0s%1|JK}Wi z;={~oL!foo5n8=}rs6MmUW~R&;SIJO3TL4Ky?kh+b2rT9B1Jl4>#Uh-Bec z`Hsp<==#UEW6pGPhNk8H!!DUQR~#F9jEMI6T*OWfN^Ze&X(4nV$wa8QUJ>oTkruH# zm~O<`J7Wxseo@FqaZMl#Y(mrFW9AHM9Kb|XBMqaZ2a)DvJgYipkDD_VUF_PKd~dT7 z#02}bBfPn9a!X!O#83=lbJSK#E}K&yx-HI#T6ua)6o0{|={*HFusCkHzs|Fn&|C3H zBck1cmfcWVUN&i>X$YU^Sn6k2H;r3zuXbJFz)r5~3$d$tUj(l1?o={MM){kjgqXRO zc5R*#{;V7AQh|G|)jLM@wGAK&rm2~@{Pewv#06pHbKn#wL0P6F1!^qw9g&cW3Z=9} zj)POhOlwsh@eF=>z?#sIs*C-Nl(yU!#DaiaxhEs#iJqQ8w%(?+6lU02MYSeDkr!B- zPjMv+on6OLXgGnAtl(ao>|X2Y8*Hb}GRW5}-IzXnoo-d0!m4Vy$GS!XOLy>3_+UGs z2D|YcQx@M#M|}TDOetGi{9lGo9m-=0-^+nKE^*?$^uHkxZh}I{#UTQd;X!L+W@jm( zDg@N4+lUqI92o_rNk{3P>1gxAL=&O;x)ZT=q1mk0kLlE$WeWuY_$0`0jY-Kkt zP*|m3AF}Ubd=`<>(Xg0har*_@x2YH}bn0Wk*OZz3*e5;Zc;2uBdnl8?&XjupbkOeNZsNh6pvsq_ydmJI+*z**{I{0K)-;p1~k8cpJXL$^t!-`E}=*4G^-E8>H!LjTPxSx zcF+cS`ommfKMhNSbas^@YbTpH1*RFrBuATUR zt{oFWSk^$xU&kbFQ;MCX22RAN5F6eq9UfR$ut`Jw--p2YX)A*J69m^!oYfj2y7NYcH6&r+0~_sH^c^nzeN1AU4Ga7=FlR{S|Mm~MpzY0$Z+p2W(a={b-pR9EO1Rs zB%KY|@wLcAA@)KXi!d2_BxrkhDn`DT1=Dec}V!okd{$+wK z4E{n8R*xKyci1(CnNdhf$Dp2(Jpof0-0%-38X=Dd9PQgT+w%Lshx9+loPS~MOm%ZT zt%2B2iL_KU_ita%N>xjB!#71_3=3c}o zgeW~^U_ZTJQ2!PqXulQd=3b=XOQhwATK$y(9$#1jOQ4}4?~l#&nek)H(04f(Sr=s| zWv7Lu1=%WGk4FSw^;;!8&YPM)pQDCY9DhU`hMty1@sq1=Tj7bFsOOBZOFlpR`W>-J$-(kezWJj;`?x-v>ev{*8V z8p|KXJPV$HyQr1A(9LVrM47u-XpcrIyO`yWvx1pVYc&?154aneRpLqgx)EMvRaa#|9?Wwqs2+W8n5~79G z(}iCiLk;?enn}ew`HzhG+tu+Ru@T+K5juvZN)wY;x6HjvqD!&!)$$;1VAh~7fg0K| zEha#aN=Yv|3^~YFH}cc38ovVb%L|g@9W6fo(JtT6$fa?zf@Ct88e}m?i)b*Jgc{fl zExfdvw-BYDmH6>(4QMt#p0;FUIQqkhD}aH?a7)_%JtA~soqj{ppP_82yi9kaxuK>~ ze_)Zt>1?q=ZH*kF{1iq9sr*tVuy=u>Zev}!gEZx@O6-fjyu9X00gpIl-fS_pzjpqJ z1yqBmf9NF!jaF<+YxgH6oXBdK)sH(>VZ)1siyA$P<#KDt;8NT*l_0{xit~5j1P)FN zI8hhYKhQ)i z37^aP13B~u65?sg+_@2Kr^iWHN=U;EDSZ@2W2!5ALhGNWXnFBY%7W?1 z=HI9JzQ-pLKZDYTv<0-lt|6c-RwhxZ)mU2Os{bsX_i^@*fKUj8*aDO5pks=qn3Dv6 zwggpKLuyRCTVPwmw1r}B#AS}?X7b837UlXwp~E2|PJw2SGVueL7){Y&z!jL!XN=0i zU^Eig`S2`{+gU$68aRdWx?BZ{sU_f=8sn~>s~M?GU~`fH5kCc; z8ICp+INM3(3{#k32RZdv6b9MQYdZXNuk7ed8;G?S2nT+NZBG=Tar^KFl2SvhW$bGW#kdWL-I)s_IqVnCDDM9fm8g;P;8 z7t4yZn3^*NQfx7SwmkzP$=fwdC}bafQSEF@pd&P8@H#`swGy_rz;Z?Ty5mkS%>m#% zp_!m9e<()sfKiY(nF<1zBz&&`ZlJf6QLvLhl`_``%RW&{+O>Xhp;lwSsyRqGf=RWd zpftiR`={2(siiPAS|p}@q=NhVc0ELprt%=fMXO3B)4ryC2LT(o=sLM7hJC!}T1@)E zA3^J$3&1*M6Xq>03FX`R&w*NkrZE?FwU+Muut;>qNhj@bX17ZJxnOlPSZ=Zeiz~T_ zOu#yc3t6ONHB;?|r4w+pI)~KGN;HOGC)txxiUN8#mexj+W(cz%9a4sx|IRG=}ia zuEBuba3AHsV2feqw-3MvuL`I+2|`Ud4~7ZkN=JZ;L20|Oxna5vx1qbIh#k2O4$RQF zo`tL()zxaqibg^GbB+BS5#U{@K;WWQj~GcB1zb}zJkPwH|5hZ9iH2308!>_;%msji zJHSL~s)YHBR=Koa1mLEOHos*`gp=s8KA-C zu0aE+W!#iJ*0xqKm3A`fUGy#O+X+5W36myS>Uh2!R*s$aCU^`K&KKLCCDkejX2p=5 z%o7-fl03x`gaSNyr?3_JLv?2RLS3F*8ub>Jd@^Cc17)v8vYEK4aqo?OS@W9mt%ITJ z9=S2%R8M){CugT@k~~0x`}Vl!svYqX=E)c_oU6o}#Hb^%G1l3BudxA{F*tbjG;W_>=xV73pKY53v%>I)@D36I_@&p$h|Aw zonQS`07z_F#@T-%@-Tb|)7;;anoD_WH>9ewFy(ZcEOM$#Y)8>qi7rCnsH9GO-_7zF zu*C87{Df1P4TEOsnzZ@H%&lvV(3V@;Q!%+OYRp`g05PjY^gL$^$-t0Y>H*CDDs?FZly*oZ&dxvsxaUWF!{em4{A>n@vpXg$dwvt@_rgmHF z-MER`ABa8R-t_H*kv>}CzOpz;!>p^^9ztHMsHL|SRnS<-y5Z*r(_}c4=fXF`l^-i}>e7v!qs_jv zqvWhX^F=2sDNWA9c@P0?lUlr6ecrTKM%pNQ^?*Lq?p-0~?_j50xV%^(+H>sMul#Tw zeciF*1=?a7cI(}352%>LO96pD+?9!fNyl^9v3^v&Y4L)mNGK0FN43&Xf8jUlxW1Bw zyiu2;qW-aGNhs=zbuoxnxiwZ3{PFZM#Kw)9H@(hgX23h(`Wm~m4&TvoZoYp{plb^> z_#?vXcxd>r7K+1HKJvhed>gtK`TAbJUazUWQY6T~t2af%#<+Veyr%7-#*A#@&*;@g58{i|E%6yC_InGXCOd{L0;$)z#?n7M`re zh!kO{6=>7I?*}czyF7_frt#)s1CFJ_XE&VrDA?Dp3XbvF{qsEJgb&OLSNz_5g?HpK z9)8rsr4JN!Af3G9!#Qn(6zaUDqLN(g2g8*M)Djap?WMK9NKlkC)E2|-g|#-rp%!Gz zAHd%`iq|81efi93m3yTBw3g0j#;Yb2X{mhRAI?&KDmbGqou(2xiRNb^sV}%%Wu0?< z?($L>(#BO*)^)rSgyNRni$i`R4v;GhlCZ8$@e^ROX(p=2_v6Y!%^As zu022)fHdv_-~Yu_H6WVPLpHQx!W%^6j)cBhS`O3QBW#x(eX54d&I22op(N59b*&$v zFiSRY6rOc^(dgSV1>a7-5C;(5S5MvKcM2Jm-LD9TGqDpP097%52V+0>Xqq!! zq4e3vj53SE6i8J`XcQB|MZPP8j;PAOnpGnllH6#Ku~vS42xP*Nz@~y%db7Xi8s09P z1)e%8ys6&M8D=Dt6&t`iKG_4X=!kgRQoh%Z`dc&mlOUqXk-k`jKv9@(a^2-Upw>?< zt5*^DV~6Zedbec4NVl($2T{&b)zA@b#dUyd>`2JC0=xa_fIm8{5um zr-!ApXZhC8@=vC2WyxO|!@0Km)h8ep*`^he92$@YwP>VcdoS5OC^s38e#7RPsg4j+ zbVGG}WRSET&ZfrcR(x~k8n1rTP%CnfUNKUonD$P?FtNFF#cn!wEIab-;jU=B1dHK@ z(;(yAQJ`O$sMn>h;pf^8{JISW%d+@v6@CnXh9n5TXGC}?FI9i-D0OMaIg&mAg=0Kn zNJ7oz5*ReJukD55fUsMuaP+H4tDN&V9zfqF@ zr=#ecUk9wu{0;!+gl;3Bw=Vn^)z$ahVhhw)io!na&9}LmWurLb0zubxK=UEnU*{5P z+SP}&*(iBKSO4{alBHaY^)5Q=mZ+2OwIooJ7*Q5XJ+2|q`9#f?6myq!&oz?klihLq z4C)$XP!BNS0G_Z1&TM>?Jk{S~{F3n83ioli=IO6f%wkvCl(RFFw~j0tb{GvXTx>*sB0McY0s&SNvj4+^h`9nJ_wM>F!Uc>X}9PifQekn0sKI2SAJP!a4h z5cyGTuCj3ZBM^&{dRelIlT^9zcfaAuL5Y~bl!ppSf`wZbK$z#6U~rdclk``e+!qhe z6Qspo*%<)eu6?C;Bp<^VuW6JI|Ncvyn+LlSl;Mp22Bl7ARQ0Xc24%29(ZrdsIPw&-=yHQ7_Vle|5h>AST0 zUGX2Zk34vp?U~IHT|;$U86T+UUHl_NE4m|}>E~6q``7hccCaT^#y+?wD##Q%HwPd8 zV3x4L4|qqu`B$4(LXqDJngNy-{&@aFBvVsywt@X^}iH7P%>bR?ciC$I^U-4Foa`YKI^qDyGK7k%E%c_P=yzAi`YnxGA%DeNd++j3*h^ z=rn>oBd0|~lZ<6YvmkKY*ZJlJ;Im0tqgWu&E92eqt;+NYdxx`eS(4Hw_Jb5|yVvBg z*tbdY^!AN;luEyN4VRhS@-_DC{({ziH{&Z}iGElSV~qvT>L-8G%+yEL zX#MFOhj{InyKG=mvW-<1B@c-}x$vA(nU?>S>0*eN#!SLzQ)Ex7fvQ)S4D<8|I#N$3 zT5Ei`Z?cxBODHX8(Xp73v`IsAYC@9b;t}z0wxVuQSY1J^GRwDPN@qbM-ZF48T$GZ< z8WU+;Pqo?{ghI-KZ-i*ydXu`Ep0Xw^McH_KE9J0S7G;x8Fe`DVG?j3Pv=0YzJ}yZR z%2=oqHiUjvuk0~Ca>Kol4CFi0_xQT~;_F?=u+!kIDl-9g`#ZNZ9HCy17Ga1v^Jv9# z{T4Kb1-AzUxq*MutfOWWZgD*HnFfyYg0&e9f(5tZ>krPF6{VikNeHoc{linPPt#Si z&*g>(c54V8rT_AX!J&bNm-!umPvOR}vDai#`CX___J#=zeB*{4<&2WpaDncZsOkp* zsg<%@@rbrMkR_ux9?LsQxzoBa1s%$BBn6vk#{&&zUwcfzeCBJUwFYSF$08qDsB;gWQN*g!p8pxjofWbqNSZOEKOaTx@+* zwdt5*Q47@EOZ~EZL9s?1o?A%9TJT=Ob_13yyugvPg*e&ZU(r6^k4=2+D-@n=Hv5vu zSXG|hM(>h9^zn=eQ=$6`JO&70&2|%V5Lsx>)(%#;pcOfu>*nk_3HB_BNaH$`jM<^S zcSftDU1?nL;jy)+sfonQN}(}gUW?d_ikr*3=^{G)=tjBtEPe>TO|0ddVB zTklrSHiW+!#26frPXQQ(YN8DG$PZo?(po(QUCCf_OJC`pw*uey00%gmH!`WJkrKXj2!#6?`T25mTu9OJp2L8z3! z=arrL$ZqxuE{%yV)14Kd>k}j7pxZ6#$Dz8$@WV5p8kTqN<-7W)Q7Gt2{KoOPK_tZ| zf2WG~O5@{qPI+W<4f_;reuFVdO^5`ADC1!JQE|N`s3cq@(0WB!n0uh@*c{=LAd;~} zyGK@hbF-Oo+!nN)@i*O(`@FA#u?o=~e{`4O#5}z&=UkU*50fOrzi11D^&FOqe>wii z?*k+2|EcUs;Gx{!@KBT~>PAwLrIDT7Th=Utu?~?np@t^gFs?zgX=D${RwOY^WGh-+ z+#4$066ISh8eYW#FXWp~S`<*%O^ZuItL1Tyqt8#tZ zY120E;^VG`!lZn&3sPd$RkdHpU#|w+bYV)pJC|SH9g%|5IkxVTQcBA4CL0}$&}ef@ zW^Vtj%M;;_1xxP9x#ex17&4N*{ksO*_4O}xYu(p*JkL#yr}@7b)t5X?%CY<+s5_MJ zuiqt+N_;A(_)%lumoyRFixWa-M7qK_9s6<1X?JDa9fP!+_6u~~M$5L=ipB=7(j#f< zZ34J%=bs549%~_mA(|={uZNs_0?o7;-LBP(ZRnkd{-^|2|=4vUTmtByHL8 zEph`(LSEzQj68a+`d$V<45J7cyv^#|^|%fD#si1Nx!4NW*`l*{->HEWNh6-|g>-=r zXmQ|-i}Ku$ndUeHQ^&ieT!Lf}vf6GaqW9$DJ2NWrqwPY%%4nip$@vK$nRp*_C-v<| zuKz~ZyN&<%!NS26&x?jhy+@awJipMQ-8(X4#Ae5??U<1QMt1l9R=w9fAnEF}NYu$2 z>6}Vkc zIb*A?G*z8^IvibmBKn_u^5&T_1oey0gZS2~obf(#xk=erZGTEdQnt3DMGM+0oPwss zj5zXD;(oWhB_T@~Ig#9@v)AKtXu3>Inmgf@A|-lD-1U>cNyl3h?ADD9)GG4}zUGPk zZzaXe!~Kf?<~@$G?Uql3t8jy9{2!doq4=J}j9ktTxss{p6!9UdjyDERlA*xZ!=Q)KDs5O)phz>Vq3BNGoM(H|=1*Q4$^2fTZw z(%nq1P|5Rt81}SYJpEEzMPl5VJsV5&4e)ZWKDyoZ>1EwpkHx-AQVQc8%JMz;{H~p{=FXV>jIxvm4X*qv52e?Y-f%DJ zxEA165GikEASQ^fH6K#d!Tpu2HP{sFs%E=e$gYd$aj$+xue6N+Wc(rAz~wUsk2`(b z8Kvmyz%bKQxpP}~baG-rwYcYCvkHOi zlkR<=>ZBTU*8RF_d#Bl@zZsRIhx<%~Z@Z=ik z>adw3!DK(8R|q$vy{FTxw%#xliD~6qXmY^7_9kthVPTF~Xy1CfBqbU~?1QmxmU=+k z(ggxvEuA;0e&+ci-zQR{-f7aO{O(Pz_OsEjLh_K>MbvoZ4nxtk5u{g@nPv)cgW_R} z9}EA4K4@z0?7ue}Z(o~R(X&FjejUI2g~08PH1E4w>9o{)S(?1>Z0XMvTb|;&EuyOE zGvWNpYX)Nv<8|a^;1>bh#&znEcl-r!T#pn= z4$?Yudha6F%4b>*8@=BdtXXY4N+`U4Dmx$}>HeVJk-QdTG@t!tVT#0(LeV0gvqyyw z2sEp^9eY0N`u10Tm4n8No&A=)IeEC|gnmEXoNSzu!1<4R<%-9kY_8~5Ej?zRegMn78wuMs#;i&eUA0Zk_RXQ3b&TT} z;SCI=7-FUB@*&;8|n>(_g^HGf3@QODE3LpmX~ELnymQm{Sx9xrKS zK29p~?v@R$0=v6Dr5aW>-!{+h@?Q58|Kz8{{W`%J+lDAdb&M5VHrX_mDY;1-JLnf)ezmPau$)1;=`-FU=-r-83tX=C`S#}GZufju zQ>sXNT0Ny=k@nc%cFnvA_i4SC)?_ORXHq8B4D%el1uPX`c~uG#S1M7C+*MMqLw78E zhY2dI8@+N^qrMI1+;TUda(vGqGSRyU{Fnm`aqrr7bz42c5xsOO-~oZpkzorD1g}Y<6rk&3>PsSGy}W?MtqFky@A(X# zIuNZK0cK?^=;PUAu>j0#HtjbHCV*6?jzA&OoE$*Jlga*}LF`SF?WLhv1O|zqC<>*> zYB;#lsYKx0&kH@BFpW8n*yDcc6?;_zaJs<-jPSkCsSX-!aV=P5kUgF@Nu<{a%#K*F z134Q{9|YX7X(v$62_cY3^G%t~rD>Q0z@)1|zs)vjJ6Jq9;7#Ki`w+eS**En?7;n&7 zu==V3T&eFboN3ZiMx3D8qYc;VjFUk_H-WWCau(VFXSQf~viH0L$gwD$UfFHqNcgN`x}M+YQ6RnN<+@t>JUp#)9YOkqst-Ga?{FsDpEeX0(5v{0J~SEbWiL zXC2}M4?UH@u&|;%0y`eb33ldo4~z-x8zY!oVmV=c+f$m?RfDC35mdQ2E>Pze7KWP- z>!Bh<&57I+O_^s}9Tg^k)h7{xx@0a0IA~GAOt2yy!X%Q$1rt~LbTB6@Du!_0%HV>N zlf)QI1&gvERKwso23mJ!Ou6ZS#zCS5W`gxE5T>C#E|{i<1D35C222I33?Njaz`On7 zi<+VWFP6D{e-{yiN#M|Jgk<44u1TiMI78S5W`Sdb5f+{zu34s{CfWN7a3Cf^@L%!& zN$?|!!9j2c)j$~+R6n#891w-z8(!oBpL2K=+%a$r2|~8-(vQj5_XT`<0Ksf;oP+tz z9CObS!0m)Tgg`K#xBM8B(|Z)Wb&DYL{WTYv`;A=q6~Nnx2+!lTIXtj8J7dZE!P_{z z#f8w6F}^!?^KE#+ZDv+xd5O&3EmomZzsv?>E-~ygGum45fk!SBN&|eo1rKw^?aZJ4 E2O(~oYXATM diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e6e5897b..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.3.3-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 4f906e0c8..cccdd3d51 100755 --- a/gradlew +++ b/gradlew @@ -1,21 +1,5 @@ #!/usr/bin/env sh -# -# Copyright 2015 the original author or 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. -# - ############################################################################## ## ## Gradle start up script for UN*X @@ -44,7 +28,7 @@ APP_NAME="Gradle" 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" @@ -82,7 +66,6 @@ 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 @@ -126,11 +109,10 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then +# 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 @@ -156,19 +138,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then else eval `echo args$i`="\"$arg\"" fi - i=`expr $i + 1` + 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" ;; + (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 @@ -177,9 +159,14 @@ save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=`save "$@"` +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 2111c993e..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.block.Block; -import net.minecraft.util.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 5114a3c96..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.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.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 = JSONUtils.getJsonArray(json, "flags"); - for (JsonElement flag : flagArray) { - 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 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(JSONUtils.getString(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 test(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/client/ClientSetup.java b/src/main/java/com/mcmoddev/mineralogy/client/ClientSetup.java deleted file mode 100644 index c87b8ebbd..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.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); - } - } - } -} 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 77ce9bebb..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.gen.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/MineralogyRegistry.java b/src/main/java/com/mcmoddev/mineralogy/init/MineralogyRegistry.java deleted file mode 100644 index 2707126d3..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.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.crafting.IRecipe; - -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, IRecipe) - - 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 6a9692daf..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.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.world.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.getDefaultState(); - - 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 813527968..000000000 --- a/src/main/java/com/mcmoddev/mineralogy/worldgen/Geology.java +++ /dev/null @@ -1,114 +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.block.Block; -import net.minecraft.block.Blocks; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.ChunkPos; -import net.minecraft.world.chunk.Chunk; -import net.minecraft.world.chunk.IChunk; -import net.minecraft.world.gen.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(IChunk chunk) { - ChunkPos chunkPos = chunk.getPos(); - int xOffset = chunkPos.getXStart(); - int zOffset = chunkPos.getZStart(); - BlockPos.Mutable cursor = new BlockPos.Mutable(); - 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.getTopBlockY(Heightmap.Type.WORLD_SURFACE_WG, dx, dz); - int baseRockVal = (int) rockNoiseLayer.valueAt(x, z); - int geomeBase = (int) geomeNoiseLayer.valueAt(x, z); - - for (; y > 0; y--) { - cursor.setPos(x, y, z); - if (chunk.getBlockState(cursor).getBlock() == Blocks.STONE) { - chunk.setBlockState(cursor, pickReplacement(baseRockVal, geomeBase, y).getDefaultState(), false); - changed = true; - } - } - } - } - - if (changed && chunk instanceof Chunk) { - ((Chunk) chunk).setModified(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 af7067f75..000000000 --- a/src/main/java/com/mcmoddev/mineralogy/worldgen/GeomeConfig.java +++ /dev/null @@ -1,603 +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.block.Block; -import net.minecraft.block.Blocks; -import net.minecraft.util.RegistryKey; -import net.minecraft.util.JSONUtils; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.registry.Registry; -import net.minecraft.world.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 = JSONUtils.getJsonObject(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 = JSONUtils.getJsonObject(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 = JSONUtils.getJsonObject(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(JSONUtils.getString(json, "family")); - } catch (RuntimeException e) { - LOGGER.warn("Ignoring Mineralogy geome rock '{}' with invalid family", id); - continue; - } - - JsonObject geomeWeightsJson = JSONUtils.getJsonObject(json, "geomes", new JsonObject()); - double[] geomeWeights = readGeomeWeights(geomeWeightsJson, geomeIndexes, 1.0D); - rocks.add(new RockEntry(block.getDefaultState(), family, - JSONUtils.getInt(json, "depth_peak", 48), - Math.max(1, JSONUtils.getInt(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.getDefaultState(), 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())); - RegistryKey biomeKey = RegistryKey.getOrCreateKey(Registry.BIOME_KEY, 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.getCategory().name(); - float temperature = biome.getTemperature(); - 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 JSONUtils.getFloat(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); - addBYGDefaults(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 void addBYGDefaults(JsonObject biomes) { - String[] mountains = { "alpine_foothills", "alps", "bluff_peaks", "bluff_steeps", - "cika_mountains", "crag_gardens", "dover_mountains", "forest_fault", "pointed_stone_forest", - "red_rock_highlands", "red_rock_mountains", "redwood_mountains", "sierra_range", - "sierra_valley", "skyris_highlands", "skyris_highlands_clearing", "skyris_peaks", - "skyris_steeps", "stone_forest", "wooded_red_rock_mountains" }; - addBYGWeights(biomes, mountains, "mountain_belt", 3.5D, "stable_craton", 0.8D); - addWeights(biomes, byg("basalt_barrera"), "volcanic_arc", 3.0D, "coastal_shelf", 1.8D); - - String[] dry = { "araucaria_savanna", "baobab_savanna", "canyon_edge", "canyons", "dead_sea", - "dunes", "grassland_plateau", "lush_red_desert", "mojave_desert", "oasis", "prairie", - "prairie_clearing", "red_desert", "red_desert_dunes", "red_rock_lowlands", "shrublands", - "wooded_grassland_plateau" }; - addBYGWeights(biomes, dry, "arid_basin", 3.0D, "sedimentary_basin", 1.2D); - - String[] wet = { "bayou", "bog", "cold_swamplands", "coral_mangroves", "cypress_swamplands", - "fresh_water_lake", "glowshroom_bayou", "great_lake_isles", "great_lakes", - "guiana_springs", "mangrove_marshes", "marshlands", "polluted_lake", "vibrant_swamplands" }; - addBYGWeights(biomes, wet, "wetland_basin", 3.0D, "sedimentary_basin", 1.1D); - - String[] cold = { "blue_giant_taiga", "blue_taiga", "blue_taiga_hills", "boreal_clearing", - "boreal_forest", "boreal_forest_hills", "coniferous_clearing", "coniferous_forest", - "coniferous_forest_hills", "evergreen_clearing", "evergreen_hills", "evergreen_taiga", - "frozen_lake", "lush_tundra", "maple_hills", "maple_taiga", "northern_forest", - "red_spruce_taiga", "seasonal_giant_taiga", "seasonal_taiga", "seasonal_taiga_hills", - "shattered_glacier", "snowy_black_beach", "snowy_blue_giant_taiga", "snowy_blue_taiga", - "snowy_blue_taiga_hills", "snowy_coniferous_clearing", "snowy_coniferous_forest", - "snowy_coniferous_forest_hills", "snowy_deciduous_clearing", "snowy_deciduous_forest", - "snowy_deciduous_forest_hills", "snowy_evergreen_clearing", "snowy_evergreen_hills", - "snowy_evergreen_taiga", "snowy_rocky_black_beach" }; - addBYGWeights(biomes, cold, "glacial_highland", 2.0D, "stable_craton", 1.0D); - - String[] temperate = { "allium_fields", "amaranth_fields", "ancient_forest", "araucaria_forest", - "aspen_clearing", "aspen_forest", "aspen_forest_hills", "autumnal_valley", - "bamboo_forest", "black_forest_clearing", "black_forest_hills", "cherry_blossom_clearing", - "cherry_blossom_forest", "cika_woods", "deciduous_clearing", "deciduous_forest", - "deciduous_forest_hills", "ebony_hills", "ebony_woods", "enchanted_forest", - "enchanted_forest_hills", "enchanted_grove", "flowering_ancient_forest", - "flowering_enchanted_grove", "flowering_grove", "flowering_meadow", "fungal_patch", - "glowing_ancient_forest", "grove", "guiana_clearing", "guiana_shield", - "jacaranda_clearing", "jacaranda_forest", "jacaranda_forest_hills", "meadow", - "orchard", "pumpkin_forest", "red_oak_forest", "red_oak_forest_hills", - "redwood_clearing", "rose_fields", "seasonal_birch_forest", "seasonal_birch_forest_hills", - "seasonal_deciduous_clearing", "seasonal_deciduous_forest", - "seasonal_deciduous_forest_hills", "seasonal_forest", "seasonal_forest_hills", - "the_black_forest", "twilight_valley", "twilight_valley_hills", "weeping_witch_clearing", - "weeping_witch_forest", "wooded_meadow", "woodlands", "zelkova_clearing", - "zelkova_forest", "zelkova_forest_hills" }; - addBYGWeights(biomes, temperate, "stable_craton", 2.0D, "wetland_basin", 0.5D); - - String[] tropical = { "redwood_tropics", "tropical_fungal_forest", - "tropical_fungal_rainforest_hills", "tropical_rainforest", "tropical_rainforest_hills" }; - addBYGWeights(biomes, tropical, "wetland_basin", 2.5D, "stable_craton", 1.0D); - - String[] coastal = { "rainbow_beach", "rocky_beach", "tropical_islands", "white_beach" }; - addBYGWeights(biomes, coastal, "coastal_shelf", 3.5D); - } - - private static String bop(String path) { - return "biomesoplenty:" + path; - } - - private static String byg(String path) { - return "byg:" + path; - } - - private static void addBOPWeights(JsonObject biomes, String[] names, Object... values) { - for (String name : names) { - addWeights(biomes, bop(name), values); - } - } - - private static void addBYGWeights(JsonObject biomes, String[] names, Object... values) { - for (String name : names) { - addWeights(biomes, byg(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 6b5b9b553..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.block.Block; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.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 6e0ad49d8..000000000 --- a/src/main/java/com/mcmoddev/mineralogy/worldgen/GeomeGeology.java +++ /dev/null @@ -1,124 +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.block.Block; -import net.minecraft.block.Blocks; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.ChunkPos; -import net.minecraft.world.IWorld; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.chunk.Chunk; -import net.minecraft.world.chunk.IChunk; -import net.minecraft.world.gen.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(IWorld world, IChunk chunk) { - ChunkPos chunkPos = chunk.getPos(); - int xOffset = chunkPos.getXStart(); - int zOffset = chunkPos.getZStart(); - BlockPos.Mutable cursor = new BlockPos.Mutable(); - 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.getTopBlockY(Heightmap.Type.WORLD_SURFACE_WG, dx, dz); - cursor.setPos(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.setPos(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 instanceof Chunk) { - ((Chunk) chunk).setModified(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.block.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 bfd4751a5..000000000 --- a/src/main/java/com/mcmoddev/mineralogy/worldgen/MineralogyOreGeneration.java +++ /dev/null @@ -1,113 +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.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.registry.WorldGenRegistries; -import net.minecraft.world.biome.Biome.Category; -import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.feature.ConfiguredFeature; -import net.minecraft.world.gen.feature.FeatureSpreadConfig; -import net.minecraft.world.gen.feature.Feature; -import net.minecraft.world.gen.feature.OreFeatureConfig; -import net.minecraft.world.gen.feature.template.IRuleTestType; -import net.minecraft.world.gen.feature.template.RuleTest; -import net.minecraft.world.gen.placement.TopSolidRangeConfig; -import net.minecraft.world.gen.placement.Placement; -import net.minecraftforge.event.world.BiomeLoadingEvent; -import net.minecraftforge.registries.ForgeRegistries; - -public final class MineralogyOreGeneration { - private static final IRuleTestType MINERALOGY_ORE_TARGET_TYPE = - IRuleTestType.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() == Category.NETHER || event.getCategory() == Category.THEEND - || event.getCategory() == Category.NONE) { - return; - } - - for (ConfiguredFeature feature : CONFIGURED_FEATURES) { - event.getGeneration().withFeature(GenerationStage.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; - } - - OreFeatureConfig oreConfig = new OreFeatureConfig(MINERALOGY_ORE_TARGETS, ore.getDefaultState(), - 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).chance(chance)); - } - } - - private static ConfiguredFeature baseOreFeature(OreFeatureConfig oreConfig, OreGenerationSettings settings) { - return Feature.ORE.withConfiguration(oreConfig) - .withPlacement(Placement.RANGE.configure(new TopSolidRangeConfig(settings.minY(), - settings.minY(), settings.maxY()))) - .square(); - } - - private static void addConfiguredOreFeature(String oreName, String suffix, OreFeatureConfig oreConfig, - ConfiguredFeature configuredFeature) { - WorldGenRegistries.register(WorldGenRegistries.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 (OreFeatureConfig.FillerBlockType.BASE_STONE_OVERWORLD.test(state, random)) { - return true; - } - - Block block = state.getBlock(); - return block instanceof Rock && ((Rock) block).isStoneEquivalent; - } - - @Override - protected IRuleTestType 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 93a392201..000000000 --- a/src/main/java/com/mcmoddev/mineralogy/worldgen/StoneReplacer.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.mcmoddev.mineralogy.worldgen; - -import java.util.Random; -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.util.math.BlockPos; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.registry.WorldGenRegistries; -import net.minecraft.world.ISeedReader; -import net.minecraft.world.World; -import net.minecraft.world.biome.Biome.Category; -import net.minecraft.world.chunk.IChunk; -import net.minecraft.world.gen.ChunkGenerator; -import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.feature.ConfiguredFeature; -import net.minecraft.world.gen.feature.Feature; -import net.minecraft.world.gen.feature.IFeatureConfig; -import net.minecraft.world.gen.feature.NoFeatureConfig; -import net.minecraft.world.gen.placement.IPlacementConfig; -import net.minecraft.world.gen.placement.Placement; -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.withConfiguration(IFeatureConfig.NO_FEATURE_CONFIG) - .withPlacement(Placement.NOPE.configure(IPlacementConfig.NO_PLACEMENT_CONFIG)); - - private final Lock geologyLock = new ReentrantLock(); - private Geology geology = null; - private GeomeGeology geomeGeology = null; - private long geologySeed = Long.MIN_VALUE; - - private StoneReplacer() { - super(NoFeatureConfig.CODEC); - setRegistryName(Mineralogy.MODID, "stone_replacer"); - } - - public static void registerConfiguredFeature() { - WorldGenRegistries.register(WorldGenRegistries.CONFIGURED_FEATURE, - new ResourceLocation(Mineralogy.MODID, "stone_replacer"), CONFIGURED_FEATURE); - } - - public static void onBiomeLoading(BiomeLoadingEvent event) { - if (isOverworldCategory(event.getCategory())) { - event.getGeneration().withFeature(GenerationStage.Decoration.UNDERGROUND_ORES, CONFIGURED_FEATURE); - } - } - - @Override - public boolean generate(ISeedReader world, ChunkGenerator generator, - Random random, BlockPos pos, NoFeatureConfig config) { - if (!MineralogyConfig.placeMineralogyRock() - || world.getWorld().getDimensionKey() != World.OVERWORLD) { - return false; - } - - IChunk chunk = world.getChunk(pos.getX() >> 4, pos.getZ() >> 4); - if (MineralogyConfig.geologyMode() == GeologyMode.LEGACY) { - getLegacyGeology(world.getSeed()).replaceStoneInChunk(chunk); - } else { - getGeomeGeology(world.getSeed()).replaceStoneInChunk(world, chunk); - } - return true; - } - - private static boolean isOverworldCategory(Category category) { - return category != Category.NETHER && category != Category.THEEND && category != Category.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 90% rename from src/main/java/com/mcmoddev/mineralogy/blocks/Chalk.java rename to src/main/java/zone/moddev/mc/mineralogy/blocks/Chalk.java index ca0274693..df46dc5c5 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.block.SoundType; import net.minecraft.block.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 67% rename from src/main/java/com/mcmoddev/mineralogy/blocks/Chert.java rename to src/main/java/zone/moddev/mc/mineralogy/blocks/Chert.java index 149902a72..803fb1a0e 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/com/mcmoddev/mineralogy/blocks/DoubleSlab.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/DoubleSlab.java similarity index 65% rename from src/main/java/com/mcmoddev/mineralogy/blocks/DoubleSlab.java rename to src/main/java/zone/moddev/mc/mineralogy/blocks/DoubleSlab.java index 900cc5b0b..626c64edf 100644 --- a/src/main/java/com/mcmoddev/mineralogy/blocks/DoubleSlab.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/DoubleSlab.java @@ -1,4 +1,4 @@ -package com.mcmoddev.mineralogy.blocks; +package zone.moddev.mc.mineralogy.blocks; import java.util.Collections; import java.util.List; @@ -7,20 +7,30 @@ 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); } @@ -31,6 +41,10 @@ public ItemStack getItem(IBlockReader world, BlockPos pos, BlockState state) { } 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)); } 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 94% rename from src/main/java/com/mcmoddev/mineralogy/blocks/DryWall.java rename to src/main/java/zone/moddev/mc/mineralogy/blocks/DryWall.java index 6738c4954..612fb5329 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.block.Block; import net.minecraft.block.PaneBlock; 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 91% rename from src/main/java/com/mcmoddev/mineralogy/blocks/Gypsum.java rename to src/main/java/zone/moddev/mc/mineralogy/blocks/Gypsum.java index f41d11834..27553cde5 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.block.SoundType; import net.minecraft.block.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 eb80c7613..0217dcb6a 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.block.Block; import net.minecraft.block.SoundType; 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 f72d601fd..a9411fbc0 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.block.Block; import net.minecraft.block.SoundType; @@ -51,13 +51,10 @@ public int getHarvestLevel(BlockState state) { @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/com/mcmoddev/mineralogy/blocks/RockFurnace.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockFurnace.java similarity index 98% rename from src/main/java/com/mcmoddev/mineralogy/blocks/RockFurnace.java rename to src/main/java/zone/moddev/mc/mineralogy/blocks/RockFurnace.java index ce241db2c..a7ccfc3d8 100644 --- a/src/main/java/com/mcmoddev/mineralogy/blocks/RockFurnace.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockFurnace.java @@ -1,11 +1,11 @@ -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 com.mcmoddev.mineralogy.tileentity.TileEntityRockFurnace; +import zone.moddev.mc.mineralogy.Mineralogy; +import zone.moddev.mc.mineralogy.tileentity.TileEntityRockFurnace; import net.minecraft.block.Block; import net.minecraft.block.ContainerBlock; @@ -25,8 +25,8 @@ import net.minecraft.state.StateContainer; import net.minecraft.tileentity.TileEntity; import net.minecraft.block.BlockRenderType; -import net.minecraft.util.ActionResultType; 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; 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 270b1702e..47ad151f2 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.block.Block; import net.minecraft.block.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 9488bd123..a17cdba68 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.block.SoundType; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/mcmoddev/mineralogy/blocks/RockSaltLamp.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSaltLamp.java similarity index 93% rename from src/main/java/com/mcmoddev/mineralogy/blocks/RockSaltLamp.java rename to src/main/java/zone/moddev/mc/mineralogy/blocks/RockSaltLamp.java index 6358eab70..4cb01f20c 100644 --- a/src/main/java/com/mcmoddev/mineralogy/blocks/RockSaltLamp.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSaltLamp.java @@ -1,4 +1,4 @@ -package com.mcmoddev.mineralogy.blocks; +package zone.moddev.mc.mineralogy.blocks; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -92,11 +92,10 @@ public boolean isValidPosition(BlockState state, IWorldReader world, BlockPos po BlockPos supportPos = pos.offset(facing.getOpposite()); BlockState support = world.getBlockState(supportPos); - if (facing == Direction.UP) { - return support.isSolidSide(world, supportPos, Direction.UP); - } - if (facing == Direction.DOWN) { - return support.isSolidSide(world, supportPos, Direction.DOWN); + 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); 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 953e20ae8..9248dbc22 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.block.Block; import net.minecraft.block.BlockState; 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 98% rename from src/main/java/com/mcmoddev/mineralogy/blocks/RockSlab.java rename to src/main/java/zone/moddev/mc/mineralogy/blocks/RockSlab.java index e6534a128..99014afb8 100644 --- a/src/main/java/com/mcmoddev/mineralogy/blocks/RockSlab.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockSlab.java @@ -1,6 +1,6 @@ -package com.mcmoddev.mineralogy.blocks; +package zone.moddev.mc.mineralogy.blocks; -import com.mcmoddev.mineralogy.Mineralogy; +import zone.moddev.mc.mineralogy.Mineralogy; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -10,15 +10,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.state.DirectionProperty; import net.minecraft.state.StateContainer; -import net.minecraft.util.ActionResultType; 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.util.math.vector.Vector3d; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; diff --git a/src/main/java/com/mcmoddev/mineralogy/blocks/RockStairs.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockStairs.java similarity index 95% rename from src/main/java/com/mcmoddev/mineralogy/blocks/RockStairs.java rename to src/main/java/zone/moddev/mc/mineralogy/blocks/RockStairs.java index 89ddd82cb..1345258ec 100644 --- a/src/main/java/com/mcmoddev/mineralogy/blocks/RockStairs.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockStairs.java @@ -1,4 +1,4 @@ -package com.mcmoddev.mineralogy.blocks; +package zone.moddev.mc.mineralogy.blocks; import net.minecraft.block.Block; import net.minecraft.block.SoundType; @@ -13,7 +13,7 @@ public RockStairs(Block materialBlock, float hardness, float blastResistance, in SoundType sound, String name) { super(materialBlock.getDefaultState(), Block.Properties.create(Material.ROCK) .hardnessAndResistance(hardness, blastResistance).sound(sound)); - + this.setRegistryName(name); this.toolHardnessLevel = toolHardnessLevel; } diff --git a/src/main/java/com/mcmoddev/mineralogy/blocks/RockWall.java b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockWall.java similarity index 95% rename from src/main/java/com/mcmoddev/mineralogy/blocks/RockWall.java rename to src/main/java/zone/moddev/mc/mineralogy/blocks/RockWall.java index 2fe23d472..352134202 100644 --- a/src/main/java/com/mcmoddev/mineralogy/blocks/RockWall.java +++ b/src/main/java/zone/moddev/mc/mineralogy/blocks/RockWall.java @@ -1,4 +1,4 @@ -package com.mcmoddev.mineralogy.blocks; +package zone.moddev.mc.mineralogy.blocks; import net.minecraft.block.Block; import net.minecraft.block.SoundType; @@ -6,7 +6,7 @@ import net.minecraft.block.material.Material; import net.minecraft.block.BlockState; import net.minecraftforge.common.ToolType; - + /** * * @author Jasmine Iwanek @@ -16,7 +16,7 @@ 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; } 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 76% rename from src/main/java/com/mcmoddev/mineralogy/data/Material.java rename to src/main/java/zone/moddev/mc/mineralogy/data/Material.java index 62fcb4b89..d87361abe 100644 --- a/src/main/java/com/mcmoddev/mineralogy/data/Material.java +++ b/src/main/java/zone/moddev/mc/mineralogy/data/Material.java @@ -1,134 +1,130 @@ -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; +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 class Material { + public String materialName; + public double hardness; 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 - * - * @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 - * @param blastResistance - * how resistant the block is to explosions. For reference, dirt is - * 0, stone is 10, and blast-proof materials are 2000 - * @param toolHardnessLevel - * 0 for wood tools, 1 for stone, 2 for iron, 3 for diamond - * @param cobbleEquivilent - * is material equivalent to cobblestone - */ - public Material(String materialName, RockType rockType, - double hardness, double blastResistance, int toolHardnessLevel, + + /** + * @param materialName + * 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 + * @param blastResistance + * how resistant the block is to explosions. For reference, dirt is + * 0, stone is 10, and blast-proof materials are 2000 + * @param toolHardnessLevel + * 0 for wood tools, 1 for stone, 2 for iron, 3 for diamond + * @param cobbleEquivilent + * is material equivalent to cobblestone + */ + public Material(String materialName, double hardness, double blastResistance, int toolHardnessLevel, boolean cobbleEquivilent) { - this(materialName, rockType, hardness, blastResistance, toolHardnessLevel, cobbleEquivilent, true); + this(materialName, hardness, blastResistance, toolHardnessLevel, cobbleEquivilent, true); } - public Material(String materialName, RockType rockType, - double hardness, double blastResistance, int toolHardnessLevel, + public Material(String materialName, 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 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); - + + 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; } - - 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 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().group(MineralogyItemGroups.forBlock(blockHandle))); - + blockItem.setRegistryName(Mineralogy.MODID, blockHandle.getRegistryName().getPath()); - - return blockItem; - } - + + return blockItem; + } + 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; - } - + + return blockItem; + } + 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; - } + + 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 7f3942517..ed48eb18a 100644 --- a/src/main/java/com/mcmoddev/mineralogy/init/Blocks.java +++ b/src/main/java/zone/moddev/mc/mineralogy/init/Blocks.java @@ -1,470 +1,442 @@ -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.block.Block; -import net.minecraft.block.SoundType; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.registries.ObjectHolder; - -@Mod.EventBusSubscriber(modid = Mineralogy.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) -@ObjectHolder(Mineralogy.MODID) -public class Blocks { - - public static final Rock andesite = null; - public static final Rock basalt = null; - public static final Rock diorite = null; - public static final Rock granite = null; - public static final Rock rhyolite = null; - public static final Rock pegmatite = null; - public static final Rock shale = null; - public static final Rock conglomerate = null; - public static final Rock dolomite = null; - public static final Rock limestone = null; - public static final Rock marble = null; - public static final Rock slate = null; - public static final Rock schist = null; - 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; - public static final Rock granite_smooth = null; - public static final Rock rhyolite_smooth = null; - public static final Rock pegmatite_smooth = null; - public static final Rock shale_smooth = null; - public static final Rock conglomerate_smooth = null; - public static final Rock dolomite_smooth = null; - public static final Rock limestone_smooth = null; - public static final Rock marble_smooth = null; - public static final Rock slate_smooth = null; - public static final Rock schist_smooth = null; - 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; - public static final RockStairs granite_stairs = null; - public static final RockStairs rhyolite_stairs = null; - public static final RockStairs pegmatite_stairs = null; - public static final RockStairs shale_stairs = null; - public static final RockStairs conglomerate_stairs = null; - public static final RockStairs dolomite_stairs = null; - public static final RockStairs limestone_stairs = null; - public static final RockStairs marble_stairs = null; - public static final RockStairs slate_stairs = null; - public static final RockStairs schist_stairs = null; - 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; - public static final RockStairs granite_smooth_stairs = null; - public static final RockStairs rhyolite_smooth_stairs = null; - public static final RockStairs pegmatite_smooth_stairs = null; - public static final RockStairs shale_smooth_stairs = null; - public static final RockStairs conglomerate_smooth_stairs = null; - public static final RockStairs dolomite_smooth_stairs = null; - public static final RockStairs limestone_smooth_stairs = null; - public static final RockStairs marble_smooth_stairs = null; - public static final RockStairs slate_smooth_stairs = null; - public static final RockStairs schist_smooth_stairs = null; - 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; - public static final Rock granite_brick = null; - public static final Rock rhyolite_brick = null; - public static final Rock pegmatite_brick = null; - public static final Rock shale_brick = null; - public static final Rock conglomerate_brick = null; - public static final Rock dolomite_brick = null; - public static final Rock limestone_brick = null; - public static final Rock marble_brick = null; - public static final Rock slate_brick = null; - public static final Rock schist_brick = null; - 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; - public static final Rock granite_smooth_brick = null; - public static final Rock rhyolite_smooth_brick = null; - public static final Rock pegmatite_smooth_brick = null; - public static final Rock shale_smooth_brick = null; - public static final Rock conglomerate_smooth_brick = null; - public static final Rock dolomite_smooth_brick = null; - public static final Rock limestone_smooth_brick = null; - public static final Rock marble_smooth_brick = null; - public static final Rock slate_smooth_brick = null; - public static final Rock schist_smooth_brick = null; - 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; - public static final RockStairs granite_brick_stairs = null; - public static final RockStairs rhyolite_brick_stairs = null; - public static final RockStairs pegmatite_brick_stairs = null; - public static final RockStairs shale_brick_stairs = null; - public static final RockStairs conglomerate_brick_stairs = null; - public static final RockStairs dolomite_brick_stairs = null; - public static final RockStairs limestone_brick_stairs = null; - public static final RockStairs marble_brick_stairs = null; - public static final RockStairs slate_brick_stairs = null; - public static final RockStairs schist_brick_stairs = null; - 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; - public static final RockStairs granite_smooth_brick_stairs = null; - public static final RockStairs rhyolite_smooth_brick_stairs = null; - public static final RockStairs pegmatite_smooth_brick_stairs = null; - public static final RockStairs shale_smooth_brick_stairs = null; - public static final RockStairs conglomerate_smooth_brick_stairs = null; - public static final RockStairs dolomite_smooth_brick_stairs = null; - public static final RockStairs limestone_smooth_brick_stairs = null; - public static final RockStairs marble_smooth_brick_stairs = null; - public static final RockStairs slate_smooth_brick_stairs = null; - public static final RockStairs schist_smooth_brick_stairs = null; - 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; - public static final RockWall granite_wall = null; - public static final RockWall rhyolite_wall = null; - public static final RockWall pegmatite_wall = null; - public static final RockWall shale_wall = null; - public static final RockWall conglomerate_wall = null; - public static final RockWall dolomite_wall = null; - public static final RockWall limestone_wall = null; - public static final RockWall marble_wall = null; - public static final RockWall slate_wall = null; - public static final RockWall schist_wall = null; - 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; - public static final RockWall granite_smooth_wall = null; - public static final RockWall rhyolite_smooth_wall = null; - public static final RockWall pegmatite_smooth_wall = null; - public static final RockWall shale_smooth_wall = null; - public static final RockWall conglomerate_smooth_wall = null; - public static final RockWall dolomite_smooth_wall = null; - public static final RockWall limestone_smooth_wall = null; - public static final RockWall marble_smooth_wall = null; - public static final RockWall slate_smooth_wall = null; - public static final RockWall schist_smooth_wall = null; - 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; - public static final RockWall granite_brick_wall = null; - public static final RockWall rhyolite_brick_wall = null; - public static final RockWall pegmatite_brick_wall = null; - public static final RockWall shale_brick_wall = null; - public static final RockWall conglomerate_brick_wall = null; - public static final RockWall dolomite_brick_wall = null; - public static final RockWall limestone_brick_wall = null; - public static final RockWall marble_brick_wall = null; - public static final RockWall slate_brick_wall = null; - public static final RockWall schist_brick_wall = null; - 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; - public static final RockWall granite_smooth_brick_wall = null; - public static final RockWall rhyolite_smooth_brick_wall = null; - public static final RockWall pegmatite_smooth_brick_wall = null; - public static final RockWall shale_smooth_brick_wall = null; - public static final RockWall conglomerate_smooth_brick_wall = null; - public static final RockWall dolomite_smooth_brick_wall = null; - public static final RockWall limestone_smooth_brick_wall = null; - public static final RockWall marble_smooth_brick_wall = null; - public static final RockWall slate_smooth_brick_wall = null; - public static final RockWall schist_smooth_brick_wall = null; - 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); - } - - registerMaterialFamily(event, MaterialData.ROCK_SALT, new RockSalt(), true); - - registerSpecialGeologyBlocks(event); - registerDryWalls(event); - - event.getRegistry().registerAll( - new RockSaltLamp(), - new RockSaltStreetLamp(), - new Ore("sulfur_ore", "sulfur_dust", 1, 4, 0), - new Ore("phosphorous_ore", "phosphorous_dust", 1, 4, 0), - new Ore("nitrate_ore", "nitrate_dust", 1, 4, 0), - new Rock(false, 1.5F, 10.0F, 0, SoundType.STONE, "sulfur_block"), - 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)); - - - } - - private static void registerSpecialGeologyBlocks(RegistryEvent.Register event) { - Block chert = new Chert(); - Block gypsum = new Gypsum(); - Block chalk = new Chalk(); - Block pumice = new Rock(false, 0.5F, 5.0F, 0, SoundType.STONE, "pumice"); - - event.getRegistry().registerAll(chert, gypsum, chalk, pumice); - - MineralogyRegistry.sedimentaryStones.add(net.minecraft.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) { - event.getRegistry().register(new DryWall(color)); - } - } - - private static void registerMaterialFamily(RegistryEvent.Register event, - com.mcmoddev.mineralogy.data.Material material, Rock baseRock, boolean addToGeology) { - event.getRegistry().register(baseRock); - if (addToGeology) { - addStoneType(material.rockType, baseRock); - } - - if (MineralogyConfig.generateRockSlab()) { - registerSlabPair(event, createSlab(material, false, false), material, false, false); - if (MineralogyConfig.generateRockFurnace()) { - registerFurnacePair(event, material, false, false); - } - } - if (MineralogyConfig.generateRockStairs()) { - event.getRegistry().register(createStairs(baseRock, material, false, false)); - } - if (MineralogyConfig.generateRockWall()) { - event.getRegistry().register(createWall(baseRock, material, false, false)); - } - - Rock smoothRock = null; - if (MineralogyConfig.generateSmooth()) { - smoothRock = material.toRock(true, false); - event.getRegistry().register(smoothRock); - - if (MineralogyConfig.generateReliefs()) { - registerReliefs(event, material); - } - if (MineralogyConfig.generateSmoothSlab()) { - registerSlabPair(event, createSlab(material, true, false), material, true, false); - if (MineralogyConfig.generateSmoothFurnace()) { - registerFurnacePair(event, material, true, false); - } - } - if (MineralogyConfig.generateSmoothStairs()) { - event.getRegistry().register(createStairs(smoothRock, material, true, false)); - } - if (MineralogyConfig.generateSmoothWall()) { - event.getRegistry().register(createWall(smoothRock, material, true, false)); - } - } - - Rock brickRock = null; - if (MineralogyConfig.generateBrick()) { - brickRock = material.toRock(false, true); - event.getRegistry().register(brickRock); - - if (MineralogyConfig.generateBrickSlab()) { - registerSlabPair(event, createSlab(material, false, true), material, false, true); - if (MineralogyConfig.generateBrickFurnace()) { - registerFurnacePair(event, material, false, true); - } - } - if (MineralogyConfig.generateBrickStairs()) { - event.getRegistry().register(createStairs(brickRock, material, false, true)); - } - if (MineralogyConfig.generateBrickWall()) { - event.getRegistry().register(createWall(brickRock, material, false, true)); - } - } - - if (smoothRock != null && MineralogyConfig.generateSmoothBrick()) { - Rock smoothBrickRock = material.toRock(true, true); - event.getRegistry().register(smoothBrickRock); - - if (MineralogyConfig.generateSmoothBrickSlab()) { - registerSlabPair(event, createSlab(material, true, true), material, true, true); - if (MineralogyConfig.generateSmoothBrickFurnace()) { - registerFurnacePair(event, material, true, true); - } - } - if (MineralogyConfig.generateSmoothBrickStairs()) { - event.getRegistry().register(createStairs(smoothBrickRock, material, true, true)); - } - if (MineralogyConfig.generateSmoothBrickWall()) { - event.getRegistry().register(createWall(smoothBrickRock, material, true, true)); - } - } - } - - private static void registerSlabPair(RegistryEvent.Register event, RockSlab slab, - com.mcmoddev.mineralogy.data.Material material, boolean isSmooth, boolean isBrick) { - event.getRegistry().register(slab); - event.getRegistry().register(createDoubleSlab(slab, material, isSmooth, isBrick)); - } - - private static RockStairs createStairs(Block sourceBlock, com.mcmoddev.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, - 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, - 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, - boolean isSmooth, boolean isBrick) { - return new DoubleSlab((float) material.hardness, (float) material.blastResistance, - material.toolHardnessLevel, SoundType.STONE, sourceBlock, - getVariantName(material, isSmooth, isBrick) + "_double_slab"); - } - - private static void registerFurnacePair(RegistryEvent.Register event, - com.mcmoddev.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)); - - event.getRegistry().register(new RockFurnace((float) material.hardness, (float) material.blastResistance, - material.toolHardnessLevel, false, burnModifier, name)); - event.getRegistry().register(new RockFurnace((float) material.hardness, (float) material.blastResistance, - material.toolHardnessLevel, true, burnModifier, "lit_" + name)); - } - - private static void registerReliefs(RegistryEvent.Register event, - com.mcmoddev.mineralogy.data.Material material) { - String name = material.materialName.toLowerCase(); - String[] suffixes = new String[] { - "blank", - "axe", - "cross", - "hammer", - "hoe", - "horizontal", - "left", - "pickaxe", - "plus", - "right", - "sword", - "i", - "vertical" - }; - - for (String suffix : suffixes) { - event.getRegistry().register(new RockRelief((float) material.hardness, - (float) material.blastResistance / 2.0F, material.toolHardnessLevel, - SoundType.STONE, name + "_relief_" + suffix)); - } - } - - private static String getVariantName(com.mcmoddev.mineralogy.data.Material material, boolean isSmooth, - boolean isBrick) { - String name = material.materialName.toLowerCase(); - - if (isSmooth) { - name = name + "_smooth"; - } - if (isBrick) { - name = name + "_brick"; - } - - 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; - } - } -} - +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; +import net.minecraftforge.registries.ObjectHolder; + +@Mod.EventBusSubscriber(modid = Mineralogy.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) +@ObjectHolder(Mineralogy.MODID) +public class Blocks { + + public static final Rock andesite = null; + public static final Rock basalt = null; + public static final Rock diorite = null; + public static final Rock granite = null; + public static final Rock rhyolite = null; + public static final Rock pegmatite = null; + public static final Rock shale = null; + public static final Rock conglomerate = null; + public static final Rock dolomite = null; + public static final Rock limestone = null; + public static final Rock marble = null; + public static final Rock slate = null; + public static final Rock schist = null; + 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; + public static final Rock granite_smooth = null; + public static final Rock rhyolite_smooth = null; + public static final Rock pegmatite_smooth = null; + public static final Rock shale_smooth = null; + public static final Rock conglomerate_smooth = null; + public static final Rock dolomite_smooth = null; + public static final Rock limestone_smooth = null; + public static final Rock marble_smooth = null; + public static final Rock slate_smooth = null; + public static final Rock schist_smooth = null; + 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; + public static final RockStairs granite_stairs = null; + public static final RockStairs rhyolite_stairs = null; + public static final RockStairs pegmatite_stairs = null; + public static final RockStairs shale_stairs = null; + public static final RockStairs conglomerate_stairs = null; + public static final RockStairs dolomite_stairs = null; + public static final RockStairs limestone_stairs = null; + public static final RockStairs marble_stairs = null; + public static final RockStairs slate_stairs = null; + public static final RockStairs schist_stairs = null; + 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; + public static final RockStairs granite_smooth_stairs = null; + public static final RockStairs rhyolite_smooth_stairs = null; + public static final RockStairs pegmatite_smooth_stairs = null; + public static final RockStairs shale_smooth_stairs = null; + public static final RockStairs conglomerate_smooth_stairs = null; + public static final RockStairs dolomite_smooth_stairs = null; + public static final RockStairs limestone_smooth_stairs = null; + public static final RockStairs marble_smooth_stairs = null; + public static final RockStairs slate_smooth_stairs = null; + public static final RockStairs schist_smooth_stairs = null; + 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; + public static final Rock granite_brick = null; + public static final Rock rhyolite_brick = null; + public static final Rock pegmatite_brick = null; + public static final Rock shale_brick = null; + public static final Rock conglomerate_brick = null; + public static final Rock dolomite_brick = null; + public static final Rock limestone_brick = null; + public static final Rock marble_brick = null; + public static final Rock slate_brick = null; + public static final Rock schist_brick = null; + 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; + public static final Rock granite_smooth_brick = null; + public static final Rock rhyolite_smooth_brick = null; + public static final Rock pegmatite_smooth_brick = null; + public static final Rock shale_smooth_brick = null; + public static final Rock conglomerate_smooth_brick = null; + public static final Rock dolomite_smooth_brick = null; + public static final Rock limestone_smooth_brick = null; + public static final Rock marble_smooth_brick = null; + public static final Rock slate_smooth_brick = null; + public static final Rock schist_smooth_brick = null; + 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; + public static final RockStairs granite_brick_stairs = null; + public static final RockStairs rhyolite_brick_stairs = null; + public static final RockStairs pegmatite_brick_stairs = null; + public static final RockStairs shale_brick_stairs = null; + public static final RockStairs conglomerate_brick_stairs = null; + public static final RockStairs dolomite_brick_stairs = null; + public static final RockStairs limestone_brick_stairs = null; + public static final RockStairs marble_brick_stairs = null; + public static final RockStairs slate_brick_stairs = null; + public static final RockStairs schist_brick_stairs = null; + 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; + public static final RockStairs granite_smooth_brick_stairs = null; + public static final RockStairs rhyolite_smooth_brick_stairs = null; + public static final RockStairs pegmatite_smooth_brick_stairs = null; + public static final RockStairs shale_smooth_brick_stairs = null; + public static final RockStairs conglomerate_smooth_brick_stairs = null; + public static final RockStairs dolomite_smooth_brick_stairs = null; + public static final RockStairs limestone_smooth_brick_stairs = null; + public static final RockStairs marble_smooth_brick_stairs = null; + public static final RockStairs slate_smooth_brick_stairs = null; + public static final RockStairs schist_smooth_brick_stairs = null; + 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; + public static final RockWall granite_wall = null; + public static final RockWall rhyolite_wall = null; + public static final RockWall pegmatite_wall = null; + public static final RockWall shale_wall = null; + public static final RockWall conglomerate_wall = null; + public static final RockWall dolomite_wall = null; + public static final RockWall limestone_wall = null; + public static final RockWall marble_wall = null; + public static final RockWall slate_wall = null; + public static final RockWall schist_wall = null; + 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; + public static final RockWall granite_smooth_wall = null; + public static final RockWall rhyolite_smooth_wall = null; + public static final RockWall pegmatite_smooth_wall = null; + public static final RockWall shale_smooth_wall = null; + public static final RockWall conglomerate_smooth_wall = null; + public static final RockWall dolomite_smooth_wall = null; + public static final RockWall limestone_smooth_wall = null; + public static final RockWall marble_smooth_wall = null; + public static final RockWall slate_smooth_wall = null; + public static final RockWall schist_smooth_wall = null; + 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; + public static final RockWall granite_brick_wall = null; + public static final RockWall rhyolite_brick_wall = null; + public static final RockWall pegmatite_brick_wall = null; + public static final RockWall shale_brick_wall = null; + public static final RockWall conglomerate_brick_wall = null; + public static final RockWall dolomite_brick_wall = null; + public static final RockWall limestone_brick_wall = null; + public static final RockWall marble_brick_wall = null; + public static final RockWall slate_brick_wall = null; + public static final RockWall schist_brick_wall = null; + 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; + public static final RockWall granite_smooth_brick_wall = null; + public static final RockWall rhyolite_smooth_brick_wall = null; + public static final RockWall pegmatite_smooth_brick_wall = null; + public static final RockWall shale_smooth_brick_wall = null; + public static final RockWall conglomerate_smooth_brick_wall = null; + public static final RockWall dolomite_smooth_brick_wall = null; + public static final RockWall limestone_smooth_brick_wall = null; + public static final RockWall marble_smooth_brick_wall = null; + public static final RockWall slate_smooth_brick_wall = null; + public static final RockWall schist_smooth_brick_wall = null; + 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 (zone.moddev.mc.mineralogy.data.Material material : MaterialData.toArray()) { + registerMaterialFamily(event, material, material.toRock(false, false)); + } + + registerMaterialFamily(event, MaterialData.ROCK_SALT, new RockSalt()); + + registerSpecialGeologyBlocks(event); + registerDryWalls(event); + + event.getRegistry().registerAll( + new RockSaltLamp(), + new RockSaltStreetLamp(), + new Ore("sulfur_ore", "sulfur_dust", 1, 4, 0), + new Ore("phosphorous_ore", "phosphorous_dust", 1, 4, 0), + new Ore("nitrate_ore", "nitrate_dust", 1, 4, 0), + new Rock(false, 1.5F, 10.0F, 0, SoundType.STONE, "sulfur_block"), + 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)); + + + } + + private static void registerSpecialGeologyBlocks(RegistryEvent.Register event) { + Block chert = new Chert(); + Block gypsum = new Gypsum(); + Block chalk = new Chalk(); + Block pumice = new Rock(false, 0.5F, 5.0F, 0, SoundType.STONE, "pumice"); + + event.getRegistry().registerAll(chert, gypsum, chalk, pumice); + + } + + private static void registerDryWalls(RegistryEvent.Register event) { + for (String color : zone.moddev.mc.mineralogy.Constants.colorSuffixes) { + event.getRegistry().register(new DryWall(color)); + } + } + + private static void registerMaterialFamily(RegistryEvent.Register event, + zone.moddev.mc.mineralogy.data.Material material, Rock baseRock) { + event.getRegistry().register(baseRock); + + if (MineralogyConfig.generateRockSlab()) { + registerSlabPair(event, createSlab(material, false, false), baseRock, material, false, false); + if (MineralogyConfig.generateRockFurnace()) { + registerFurnacePair(event, material, false, false); + } + } + if (MineralogyConfig.generateRockStairs()) { + event.getRegistry().register(createStairs(baseRock, material, false, false)); + } + if (MineralogyConfig.generateRockWall()) { + event.getRegistry().register(createWall(baseRock, material, false, false)); + } + + Rock smoothRock = null; + if (MineralogyConfig.generateSmooth()) { + smoothRock = material.toRock(true, false); + event.getRegistry().register(smoothRock); + + if (MineralogyConfig.generateReliefs()) { + registerReliefs(event, material); + } + if (MineralogyConfig.generateSmoothSlab()) { + registerSlabPair(event, createSlab(material, true, false), smoothRock, material, true, false); + if (MineralogyConfig.generateSmoothFurnace()) { + registerFurnacePair(event, material, true, false); + } + } + if (MineralogyConfig.generateSmoothStairs()) { + event.getRegistry().register(createStairs(smoothRock, material, true, false)); + } + if (MineralogyConfig.generateSmoothWall()) { + event.getRegistry().register(createWall(smoothRock, material, true, false)); + } + } + + Rock brickRock = null; + if (MineralogyConfig.generateBrick()) { + brickRock = material.toRock(false, true); + event.getRegistry().register(brickRock); + + if (MineralogyConfig.generateBrickSlab()) { + registerSlabPair(event, createSlab(material, false, true), brickRock, material, false, true); + if (MineralogyConfig.generateBrickFurnace()) { + registerFurnacePair(event, material, false, true); + } + } + if (MineralogyConfig.generateBrickStairs()) { + event.getRegistry().register(createStairs(brickRock, material, false, true)); + } + if (MineralogyConfig.generateBrickWall()) { + event.getRegistry().register(createWall(brickRock, material, false, true)); + } + } + + if (smoothRock != null && MineralogyConfig.generateSmoothBrick()) { + Rock smoothBrickRock = material.toRock(true, true); + event.getRegistry().register(smoothBrickRock); + + if (MineralogyConfig.generateSmoothBrickSlab()) { + registerSlabPair(event, createSlab(material, true, true), smoothBrickRock, material, true, true); + if (MineralogyConfig.generateSmoothBrickFurnace()) { + registerFurnacePair(event, material, true, true); + } + } + if (MineralogyConfig.generateSmoothBrickStairs()) { + event.getRegistry().register(createStairs(smoothBrickRock, material, true, true)); + } + if (MineralogyConfig.generateSmoothBrickWall()) { + event.getRegistry().register(createWall(smoothBrickRock, material, true, true)); + } + } + } + + 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, fullBlock, material, isSmooth, isBrick)); + } + + 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, 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(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, 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, fullBlock, + getVariantName(material, isSmooth, isBrick) + "_double_slab"); + } + + private static void registerFurnacePair(RegistryEvent.Register event, + 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)); + + event.getRegistry().register(new RockFurnace((float) material.hardness, (float) material.blastResistance, + material.toolHardnessLevel, false, burnModifier, name)); + event.getRegistry().register(new RockFurnace((float) material.hardness, (float) material.blastResistance, + material.toolHardnessLevel, true, burnModifier, "lit_" + name)); + } + + private static void registerReliefs(RegistryEvent.Register event, + zone.moddev.mc.mineralogy.data.Material material) { + String name = material.materialName.toLowerCase(); + String[] suffixes = new String[] { + "blank", + "axe", + "cross", + "hammer", + "hoe", + "horizontal", + "left", + "pickaxe", + "plus", + "right", + "sword", + "i", + "vertical" + }; + + for (String suffix : suffixes) { + event.getRegistry().register(new RockRelief((float) material.hardness, + (float) material.blastResistance / 2.0F, material.toolHardnessLevel, + SoundType.STONE, name + "_relief_" + suffix)); + } + } + + private static String getVariantName(zone.moddev.mc.mineralogy.data.Material material, boolean isSmooth, + boolean isBrick) { + String name = material.materialName.toLowerCase(); + + if (isSmooth) { + name = name + "_smooth"; + } + if (isBrick) { + name = name + "_brick"; + } + + return name; + } + +} + 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 70% rename from src/main/java/com/mcmoddev/mineralogy/init/Items.java rename to src/main/java/zone/moddev/mc/mineralogy/init/Items.java index 4fb4f4289..63fc0d76b 100644 --- a/src/main/java/com/mcmoddev/mineralogy/init/Items.java +++ b/src/main/java/zone/moddev/mc/mineralogy/init/Items.java @@ -1,20 +1,21 @@ -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 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; @@ -81,7 +82,11 @@ private static boolean isMineralogyBlockItem(Block block) { } private static BlockItem createBlockItem(Block block) { - Item.Properties properties = new Item.Properties().group(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.maxStackSize(1); } else if (block instanceof RockSaltStreetLamp) { @@ -101,13 +106,16 @@ private static boolean isUnlitRockFurnace(Block block) { } private static Item createItem(String name) { - Item item = new Item(new Item.Properties().group(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/com/mcmoddev/mineralogy/init/MineralogyItemGroups.java b/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyItemGroups.java similarity index 71% rename from src/main/java/com/mcmoddev/mineralogy/init/MineralogyItemGroups.java rename to src/main/java/zone/moddev/mc/mineralogy/init/MineralogyItemGroups.java index 8cd42eddb..f73027910 100644 --- a/src/main/java/com/mcmoddev/mineralogy/init/MineralogyItemGroups.java +++ b/src/main/java/zone/moddev/mc/mineralogy/init/MineralogyItemGroups.java @@ -1,13 +1,7 @@ -package com.mcmoddev.mineralogy.init; +package zone.moddev.mc.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 zone.moddev.mc.mineralogy.Mineralogy; +import zone.moddev.mc.mineralogy.MineralogyConfig; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -28,29 +22,23 @@ public static ItemGroup forBlock(Block block) { return MainGroup.MINERALOGY; } - if (block instanceof RockRelief) { - return ItemGroups.ITEM; + 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; } - 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 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 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 918ccf67d..ceaa563f7 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.block.Block; import net.minecraft.tileentity.TileEntityType; 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 84% rename from src/main/java/com/mcmoddev/mineralogy/inventory/ContainerRockFurnace.java rename to src/main/java/zone/moddev/mc/mineralogy/inventory/ContainerRockFurnace.java index 0d239e3be..eee1bc195 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.entity.player.PlayerInventory; import net.minecraft.inventory.container.FurnaceContainer; 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 600cec8d8..ec01408c4 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.entity.item.ExperienceOrbEntity; import net.minecraft.entity.player.PlayerEntity; 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 d68a9c12e..90c6933a1 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.entity.player.PlayerEntity; import net.minecraft.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(ItemGroup 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 93% 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 445ed8014..557469155 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,62 +1,62 @@ -package com.mcmoddev.mineralogy.lib.data; - -import java.util.TreeMap; - -import javax.annotation.Nonnull; - -import com.google.common.collect.Maps; - -import net.minecraft.util.IStringSerializable; - -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 - * is 10. - */ - HARDNESS, - /** - * durability on a scale from 0 to 10 (or more). For reference, leather is - * 2.5, gold is 3, wood is 2, stone is 4, iron is 8, minecraft diamond is - * 10. - */ - STRENGTH, - /** - * Scale from 0 to 10 (or more) on how magical the material is. For - * reference, stone is 2, iron is 4.5, diamond is 4, wood is 6, gold is 10. - */ - MAGICAFFINITY, - /** - * The resistance the material has against explosions. - */ - BLASTRESISTANCE, - /** - * The base attack damage for the material. - */ - BASEDAMAGE; - - protected static final TreeMap MAP = Maps.newTreeMap(); - - static { - for (MaterialStats stat : values()) { - MAP.put(stat.ordinal(), stat); - } - } - - @Override +package zone.moddev.mc.mineralogy.lib.data; + +import java.util.TreeMap; + +import javax.annotation.Nonnull; + +import com.google.common.collect.Maps; + +import net.minecraft.util.IStringSerializable; + +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 + * is 10. + */ + HARDNESS, + /** + * durability on a scale from 0 to 10 (or more). For reference, leather is + * 2.5, gold is 3, wood is 2, stone is 4, iron is 8, minecraft diamond is + * 10. + */ + STRENGTH, + /** + * Scale from 0 to 10 (or more) on how magical the material is. For + * reference, stone is 2, iron is 4.5, diamond is 4, wood is 6, gold is 10. + */ + MAGICAFFINITY, + /** + * The resistance the material has against explosions. + */ + BLASTRESISTANCE, + /** + * The base attack damage for the material. + */ + BASEDAMAGE; + + protected static final TreeMap MAP = Maps.newTreeMap(); + + static { + for (MaterialStats stat : values()) { + MAP.put(stat.ordinal(), stat); + } + } + + @Override public String getString() { return name().toLowerCase(); } - - public static MaterialStats getType(@Nonnull int ordinal) { - if ((ordinal > values().length) || (ordinal < 0)) { - ordinal = 0; - } - return values()[ordinal]; - } - - @Override - public String toString() { + + public static MaterialStats getType(@Nonnull int ordinal) { + if ((ordinal > values().length) || (ordinal < 0)) { + ordinal = 0; + } + return values()[ordinal]; + } + + @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 93% 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 711a1e53d..466e9d91b 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,55 +1,55 @@ -package com.mcmoddev.mineralogy.lib.data; - -import java.util.Locale; -import java.util.TreeMap; - -import javax.annotation.Nonnull; - -import com.google.common.collect.Maps; - -import net.minecraft.util.IStringSerializable; - -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, - - // Blocks - BARS, BLOCK, BOOKSHELF, BUTTON, DOUBLE_SLAB, FLOWER_POT, LADDER, LEVER, PLATE, PRESSURE_PLATE, STAIRS, TRAPDOOR, TRIPWIRE_HOOK, WALL, FENCE, FENCE_GATE, - - // ItemBlocks - ANVIL, DOOR, SLAB, - - // Mekanism - CRYSTAL, SHARD, CLUMP, POWDER_DIRTY, - - // IC2 - CASING, DENSE_PLATE, CRUSHED, CRUSHED_PURIFIED, - - // Ores - ORE, ENDORE, NETHERORE, MEK_CRYSTAL; - - protected static final TreeMap MAP = Maps.newTreeMap(); - - static { - for (Names name : values()) { - MAP.put(name.ordinal(), name); - } - } - - @Override +package zone.moddev.mc.mineralogy.lib.data; + +import java.util.Locale; +import java.util.TreeMap; + +import javax.annotation.Nonnull; + +import com.google.common.collect.Maps; + +import net.minecraft.util.IStringSerializable; + +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, + + // Blocks + BARS, BLOCK, BOOKSHELF, BUTTON, DOUBLE_SLAB, FLOWER_POT, LADDER, LEVER, PLATE, PRESSURE_PLATE, STAIRS, TRAPDOOR, TRIPWIRE_HOOK, WALL, FENCE, FENCE_GATE, + + // ItemBlocks + ANVIL, DOOR, SLAB, + + // Mekanism + CRYSTAL, SHARD, CLUMP, POWDER_DIRTY, + + // IC2 + CASING, DENSE_PLATE, CRUSHED, CRUSHED_PURIFIED, + + // Ores + ORE, ENDORE, NETHERORE, MEK_CRYSTAL; + + protected static final TreeMap MAP = Maps.newTreeMap(); + + static { + for (Names name : values()) { + MAP.put(name.ordinal(), name); + } + } + + @Override public String getString() { return this.name(); } - - public static Names getType(@Nonnull int ordinal) { - if ((ordinal > values().length) || (ordinal < 0)) { - ordinal = 0; - } - return values()[ordinal]; - } - - @Override - public String toString() { + + public static Names getType(@Nonnull int ordinal) { + if ((ordinal > values().length) || (ordinal < 0)) { + ordinal = 0; + } + return values()[ordinal]; + } + + @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 94% rename from src/main/java/com/mcmoddev/mineralogy/patching/LegacyWorldDataHook.java rename to src/main/java/zone/moddev/mc/mineralogy/patching/LegacyWorldDataHook.java index c5dd11885..2eb9265c8 100644 --- a/src/main/java/com/mcmoddev/mineralogy/patching/LegacyWorldDataHook.java +++ b/src/main/java/zone/moddev/mc/mineralogy/patching/LegacyWorldDataHook.java @@ -1,4 +1,4 @@ -package com.mcmoddev.mineralogy.patching; +package zone.moddev.mc.mineralogy.patching; import java.io.File; import java.io.FileInputStream; @@ -15,11 +15,11 @@ import java.util.HashMap; import java.util.Map; -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 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 com.mojang.serialization.Dynamic; import net.minecraft.block.Block; @@ -208,6 +208,9 @@ public static CompoundNBT finalizeLegacyChunk(CompoundNBT root) { return root; } CompoundNBT level = root.getCompound("Level"); + if (legacyWorldActive) { + normalizeLegacyTileEntityIds(level); + } if (level.getBoolean(PRESERVE_CHUNK_MARKER)) { level.putString("Status", "full"); level.remove(PRESERVE_CHUNK_MARKER); @@ -215,6 +218,18 @@ public static CompoundNBT finalizeLegacyChunk(CompoundNBT root) { return root; } + private static void normalizeLegacyTileEntityIds(CompoundNBT level) { + ListNBT tileEntities = level.getList("TileEntities", 10); + for (int index = 0; index < tileEntities.size(); ++index) { + CompoundNBT tileEntity = tileEntities.getCompound(index); + String id = tileEntity.getString("id"); + String normalized = LegacyTileEntityIdNormalizer.normalize(id); + if (!normalized.equals(id)) { + tileEntity.putString("id", normalized); + } + } + } + private static int installLegacyBlockStates(CompoundNBT blockSnapshot) { LEGACY_MINERALOGY_BLOCK_IDS.clear(); LEGACY_ROCK_FURNACE_BLOCK_IDS.clear(); 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 02d9e75b4..a620f63cf 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.block.Block; import net.minecraft.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 81de951e7..192cef172 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.block.Block; import net.minecraft.block.BlockState; 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 86% rename from src/main/java/com/mcmoddev/mineralogy/util/BlockItemPair.java rename to src/main/java/zone/moddev/mc/mineralogy/util/BlockItemPair.java index 3be772b74..d683eced6 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.block.Block; import net.minecraft.item.Item; diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 1ff30edd0..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="[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,10 +18,17 @@ Fills the world with real-world rocks. [[dependencies.mineralogy]] modId="forge" mandatory=true - versionRange="[36,)" + 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 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 98019b1b7..d3c8e4f38 100644 --- a/src/main/resources/coremods/mineralogy_legacy_world_fix.js +++ b/src/main/resources/coremods/mineralogy_legacy_world_fix.js @@ -22,7 +22,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/CompoundNBT;)V', false)); @@ -33,7 +33,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/CompoundNBT;)Lnet/minecraft/nbt/CompoundNBT;', 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.json b/src/main/resources/data/minecraft/recipes/mossy_cobblestone.json deleted file mode 100644 index 9b556b820..000000000 --- a/src/main/resources/data/minecraft/recipes/mossy_cobblestone.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "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 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 4216470fd..4d48967ee 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 d361e6db3..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,7 +22,17 @@ "conditions": { "items": [ { - "item": "mineralogy:amphibolite" + "item": "mineralogy:amphibolite_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" ] ] -} \ No newline at end of file +} 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 7e2bf418e..51a6d1aa4 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 3e39c0e1f..b32b8ee29 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" @@ -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" ] ] -} \ No newline at end of file +} 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 96fc6f180..c1d4b30e7 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 9b4668ac7..5bed5687d 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 265f12c0b..1eef69a2a 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 a27be2df7..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": [ { - "item": "mineralogy: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" ] ] -} \ No newline at end of file +} 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 6e3f7d74e..c2bb34074 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 7f04fabb5..04ab33ff8 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" ] ] -} \ No newline at end of file +} 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 f59cacd54..73db6cf26 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 46b497088..7257573f7 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 7ed61b214..c4eb02d80 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 e52ee5422..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": [ { - "item": "mineralogy: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" ] ] -} \ No newline at end of file +} 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 784b4d4bd..a0b4d3cfc 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 8f3843d69..6decfbfee 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" ] ] -} \ No newline at end of file +} 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 160c43da8..40080159a 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 a9ffec670..3c4aa5740 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 705173a4d..c8e80ef08 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 07a995fa4..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,7 +22,17 @@ "conditions": { "items": [ { - "item": "mineralogy:basaltic_glass" + "item": "mineralogy:basaltic_glass_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" ] ] -} \ No newline at end of file +} 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 263d48a50..6f55116f6 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 79e5a70ef..8f60710a3 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" @@ -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" ] ] -} \ No newline at end of file +} 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 6c064e046..d7884d2fc 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 14d92e0da..2320eabac 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 eec62dff9..d772a2de7 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 45c461e00..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,7 +22,17 @@ "conditions": { "items": [ { - "item": "mineralogy:conglomerate" + "item": "mineralogy:conglomerate_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" ] ] -} \ No newline at end of file +} 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 9e3baf005..8d7c72997 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 45426df66..a9abe0911 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" @@ -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" ] ] -} \ No newline at end of file +} 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 a20a45b0a..c38f7806e 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 f9f8403af..9d77ee006 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 c16d17d9e..e898cd1c7 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 18261b5c7..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,7 +22,17 @@ "conditions": { "items": [ { - "item": "mineralogy:diabase" + "item": "mineralogy:diabase_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" ] ] -} \ No newline at end of file +} 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 0c3c93fed..ded9d62d7 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 1c8a405d0..2dbb5c9f4 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" @@ -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" ] ] -} \ No newline at end of file +} 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 af9b2458f..9b5244656 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 fc885a36f..5ac01590e 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 1725b2dbd..92656e3b4 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 1c7461f9e..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": [ { - "item": "mineralogy: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" ] ] -} \ No newline at end of file +} 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 225b07e4a..3c31462cd 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 1b7d8c255..802c67c1c 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" ] ] -} \ No newline at end of file +} 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 cbdf492ec..8fc6edc2c 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 848a25ca2..34da537d2 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 82436984e..37b27623e 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 d154077eb..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,7 +22,17 @@ "conditions": { "items": [ { - "item": "mineralogy:dolomite" + "item": "mineralogy:dolomite_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" ] ] -} \ No newline at end of file +} 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 70b8c9d18..f985fd72d 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 8652d0511..8e0263f15 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" @@ -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" ] ] -} \ No newline at end of file +} 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 0d29286be..435e464dc 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 1f3287f10..7adc9cdf2 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 7e1b7c7c5..7b22683a5 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 d8866066a..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,7 +22,17 @@ "conditions": { "items": [ { - "item": "mineralogy:gabbro" + "item": "mineralogy:gabbro_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" ] ] -} \ No newline at end of file +} 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 b0a53b3eb..259cbb611 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 e04684a9c..48505211b 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" @@ -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" ] ] -} \ No newline at end of file +} 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 75d7eee5f..9d0b0d151 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 f9bb32c7d..b79fb912d 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 9181c879e..d021ea07c 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 541baee10..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,7 +22,17 @@ "conditions": { "items": [ { - "item": "mineralogy:gneiss" + "item": "mineralogy:gneiss_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" ] ] -} \ No newline at end of file +} 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 5d209136b..5f110f319 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 edf537a5e..e364cb4bb 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" @@ -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" ] ] -} \ No newline at end of file +} 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 2b531d118..eece87437 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 640a690ca..76334b5e8 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 1cb035287..fec9861c0 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 9f9fd617c..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": [ { - "item": "mineralogy: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" ] ] -} \ No newline at end of file +} 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 100daa13e..6efbf2b68 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 0f2a12bcd..524219652 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" ] ] -} \ No newline at end of file +} 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 029002f59..9a7f49e76 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 fa540a918..ea04ed090 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 258fc4f2b..b035f1db0 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 7c41e03b2..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,7 +22,17 @@ "conditions": { "items": [ { - "item": "mineralogy:hornfels" + "item": "mineralogy:hornfels_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" ] ] -} \ No newline at end of file +} 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 47e5a74cf..611d0ecef 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 50fb0f75e..226096b53 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" @@ -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" ] ] -} \ No newline at end of file +} 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 e8ddabe66..9c57a3fbc 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 1edf6df9c..1b723acc3 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 3e332b5d5..0bd7afafa 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 9beebf5b3..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,7 +22,17 @@ "conditions": { "items": [ { - "item": "mineralogy:limestone" + "item": "mineralogy:limestone_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" ] ] -} \ No newline at end of file +} 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 630c9d395..c94c36366 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 970e297a5..63ee47152 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" @@ -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" ] ] -} \ No newline at end of file +} 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 9ecd222e1..f520d9af0 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 8ed1f79e3..6be29aa3f 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 9657f1b72..b951f58fb 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 4ac8cb3ed..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,7 +22,17 @@ "conditions": { "items": [ { - "item": "mineralogy:marble" + "item": "mineralogy:marble_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" ] ] -} \ No newline at end of file +} 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 d298293ac..679d65b03 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 be8a5b05d..374feaede 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" @@ -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" ] ] -} \ No newline at end of file +} 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 e2e14e370..c42fb8740 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 e90695858..5b9a56d25 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 3d70e7a69..54cd7b406 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 aea035998..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,7 +22,17 @@ "conditions": { "items": [ { - "item": "mineralogy:novaculite" + "item": "mineralogy:novaculite_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" ] ] -} \ No newline at end of file +} 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 686207cd1..96c1bdcad 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 412f8bdcb..aeb861adb 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" @@ -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" ] ] -} \ No newline at end of file +} 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 f19a7260d..75e2d0cb9 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 531d0aa98..6680e9fb1 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 386caf05b..dc02bb446 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 4891d317c..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,7 +22,17 @@ "conditions": { "items": [ { - "item": "mineralogy:pegmatite" + "item": "mineralogy:pegmatite_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" ] ] -} \ No newline at end of file +} 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 84b6bcebc..7070350f8 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 42c95c51b..3b91a283b 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" @@ -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" ] ] -} \ No newline at end of file +} 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 c2df4f12a..6e3df2363 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 ba377f633..ee13cca90 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 ecfefd2a7..70115d023 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 5f4f43f0c..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,7 +22,17 @@ "conditions": { "items": [ { - "item": "mineralogy:peridotite" + "item": "mineralogy:peridotite_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" ] ] -} \ No newline at end of file +} 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 1c0144ae4..0906780b1 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 068dd62c5..1bca727f7 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" @@ -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" ] ] -} \ No newline at end of file +} 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 5492e2e4f..7e3729c9b 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 da873e506..fe90bce0d 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 6a0307681..5a8771785 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 92ddbc832..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,7 +22,17 @@ "conditions": { "items": [ { - "item": "mineralogy:phyllite" + "item": "mineralogy:phyllite_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" ] ] -} \ No newline at end of file +} 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 5ddeb1259..ded9ddf26 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 620e6e59e..d0db8a76a 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" @@ -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" ] ] -} \ No newline at end of file +} 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 946ba18f2..aa231fe15 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 77233dbdf..53ca03852 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 c577c58ec..9d5d717d4 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 0a9c76157..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,7 +22,17 @@ "conditions": { "items": [ { - "item": "mineralogy:quartzite" + "item": "mineralogy:quartzite_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" ] ] -} \ No newline at end of file +} 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 3ba77ef0e..ea293ce48 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 5af68e4ee..46e12f473 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" @@ -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" ] ] -} \ No newline at end of file +} 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 3cda801de..7e300c173 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 79bc5df4b..7a9aafb3f 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 32bc31993..933a5e637 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 79abb5c59..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,7 +22,17 @@ "conditions": { "items": [ { - "item": "mineralogy:rhyolite" + "item": "mineralogy:rhyolite_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" ] ] -} \ No newline at end of file +} 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 1c5f02dd7..de486e51a 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 1dc602d4c..5f8fd598a 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" @@ -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" ] ] -} \ No newline at end of file +} 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 216a26b14..f1e0c8d40 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 1bd7fa387..e87f4ab00 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 c71650eb3..89bbb99dc 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 c6b77d76f..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,7 +22,17 @@ "conditions": { "items": [ { - "item": "mineralogy:rock_salt" + "item": "mineralogy:rock_salt_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" ] ] -} \ No newline at end of file +} 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 96d75e198..4cf967d85 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 409ecb0ad..81120f308 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" @@ -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" ] ] -} \ No newline at end of file +} 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 c53f0379c..495278633 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 f75ec63ee..c3e257fe2 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rocksaltlamp.json b/src/main/resources/data/mineralogy/advancements/recipes/rocksaltlamp.json index 86defd07b..c7001fdcf 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" @@ -28,4 +38,4 @@ "has_rock" ] ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/mineralogy/advancements/recipes/rocksaltstreetlamp.json b/src/main/resources/data/mineralogy/advancements/recipes/rocksaltstreetlamp.json index 91e4fed88..366b9dd4e 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" @@ -28,4 +38,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 f1c300f62..1cb82c585 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 d7b0ce14c..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,7 +22,17 @@ "conditions": { "items": [ { - "item": "mineralogy:schist" + "item": "mineralogy:schist_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" ] ] -} \ No newline at end of file +} 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 e875f8f2a..8e98139e8 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 9c8c3359c..eb28866f1 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" @@ -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" ] ] -} \ No newline at end of file +} 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 a5af22123..568b2f577 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 261e22ea0..242af868f 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 4e60653da..e391b251f 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 b8a71bd9d..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,7 +22,17 @@ "conditions": { "items": [ { - "item": "mineralogy:scoria" + "item": "mineralogy:scoria_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" ] ] -} \ No newline at end of file +} 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 8fdf4b7d5..1b2a956a5 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 4ff0a7634..6d1d3f164 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" @@ -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" ] ] -} \ No newline at end of file +} 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 a5b7e9bd5..a49a195d7 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 e49e7ee91..51aa4350f 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 899a33d00..eed16fc5f 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 a693e98e5..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,7 +22,17 @@ "conditions": { "items": [ { - "item": "mineralogy:shale" + "item": "mineralogy:shale_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" ] ] -} \ No newline at end of file +} 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 026006fb2..de1247037 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 8c71817a0..fce0bf6be 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" @@ -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" ] ] -} \ No newline at end of file +} 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 8b624e18e..06937aa98 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 50338d650..16fe143a0 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 99d6bb14a..c41ec6b0e 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 a37babfa5..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,7 +22,17 @@ "conditions": { "items": [ { - "item": "mineralogy:siltstone" + "item": "mineralogy:siltstone_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" ] ] -} \ No newline at end of file +} 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 7742bb640..cff430ad1 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 3db1e4a1e..aec10cdb2 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" @@ -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" ] ] -} \ No newline at end of file +} 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 ca23f7d8b..51c973b4a 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 36204063c..c907c9fe8 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 31c3d840f..79564145e 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 f9dbeaa6d..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,7 +22,17 @@ "conditions": { "items": [ { - "item": "mineralogy:slate" + "item": "mineralogy:slate_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" ] ] -} \ No newline at end of file +} 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 e9cf65921..5368bc9d7 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 6d2ddda4d..8045d68b9 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" @@ -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" ] ] -} \ No newline at end of file +} 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 c5774dc15..bce0db41a 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 9ed80caac..aeb949783 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 50ae09621..84ce4f432 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 81517b3ba..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": [ { - "item": "mineralogy: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" ] ] -} \ No newline at end of file +} 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 7372eb1db..c99011747 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 356801c1b..b72622774 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" ] ] -} \ No newline at end of file +} 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 b8ab020c1..b54e0ad3c 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 42435936d..11f0aeb01 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" @@ -28,4 +34,4 @@ "has_rock" ] ] -} \ No newline at end of file +} 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 01d20464d..261ae3de0 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:amphibolite" + "tag": "mineralogy:stones/amphibolite" } }, "result": { "item": "mineralogy:amphibolite_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ] + } } 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 eccb2c6df..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:amphibolite_brick_slab" + "tag": "mineralogy:slabs/amphibolite/brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:amphibolite_brick_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ] + "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 34b9fc147..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:amphibolite_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ] + } } 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 8585772f5..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:amphibolite_brick" + "tag": "mineralogy:stones/amphibolite/brick" } }, "result": { "item": "mineralogy:amphibolite_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ] + } } 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 19fa4dc1e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:amphibolite_brick" + "tag": "mineralogy:stones/amphibolite/brick" } }, "result": { "item": "mineralogy:amphibolite_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ] + } } 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 a1e15c402..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": [ { - "item": "mineralogy:amphibolite" + "tag": "mineralogy:stones/amphibolite" }, { - "item": "mineralogy: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 32970c233..68351b492 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,23 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:amphibolite_slab" + "tag": "mineralogy:slabs/amphibolite" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:amphibolite_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] + "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 23721be48..000000000 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_furnace_from_rock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:amphibolite" - } - }, - "result": { - "item": "mineralogy:amphibolite_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] -} 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 f621c2ba0..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_axe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:amphibolite_relief_axe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 af9b1cbdf..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_blank" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:amphibolite_relief_blank", "count": 16 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 382504f99..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_cross" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:amphibolite_relief_cross", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 c6f89bc29..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_hammer" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "zxz", @@ -19,15 +25,5 @@ "result": { "item": "mineralogy:amphibolite_relief_hammer", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 d2a6ef4da..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_hoe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:amphibolite_relief_hoe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 830768942..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_horizontal" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:amphibolite_relief_horizontal", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 9e2c4f2b8..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_i" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:amphibolite_relief_i", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 698da1c75..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_left" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:amphibolite_relief_left", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 05de2efbe..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_pickaxe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:amphibolite_relief_pickaxe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 7b121b5fa..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_plus" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ " x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:amphibolite_relief_plus", "count": 5 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 72aa17080..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,27 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:amphibolite_relief_left" - } - }, - "result": { - "item": "mineralogy:amphibolite_relief_right", - "count": 3 - }, "conditions": [ { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:amphibolite_relief_left" }, { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" + "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 41d6bf618..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_sword" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:amphibolite_relief_sword", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 054abd4db..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_relief_vertical" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:amphibolite_relief_vertical", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_slab.json b/src/main/resources/data/mineralogy/recipes/amphibolite_slab.json index 23469a6af..b4f9f5b4a 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,11 +17,5 @@ "result": { "item": "mineralogy:amphibolite_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] + } } 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 62b60d919..000000000 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_slab_from_amphibolite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:amphibolite" - }, - "result": "mineralogy:amphibolite_slab", - "count": 2, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth.json b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth.json index 5eb32d332..506473bad 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_smooth.json @@ -1,20 +1,21 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:amphibolite" + "tag": "mineralogy:stones/amphibolite" }, { "item": "minecraft:sand" } ], "result": { - "item": "mineralogy:amphibolite_smooth" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ] + "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 bf19c11fa..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:amphibolite_smooth" + "tag": "mineralogy:stones/amphibolite/smooth" } }, "result": { "item": "mineralogy:amphibolite_smooth_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ] + } } 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 ec1887ed6..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,31 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:amphibolite_smooth_brick_slab" + "tag": "mineralogy:slabs/amphibolite/smooth_brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:amphibolite_smooth_brick_furnace" - }, - "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" - } - ] + "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 9a9f2a48f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,19 +17,5 @@ "result": { "item": "mineralogy:amphibolite_smooth_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ] + } } 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 0b68b0c4f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,25 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:amphibolite_smooth_brick" + "tag": "mineralogy:stones/amphibolite/smooth_brick" } }, "result": { "item": "mineralogy:amphibolite_smooth_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ] + } } 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 305a7023e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,25 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:amphibolite_smooth_brick" + "tag": "mineralogy:stones/amphibolite/smooth_brick" } }, "result": { "item": "mineralogy:amphibolite_smooth_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ] + } } 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 3179cdf72..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:amphibolite_smooth_slab" + "tag": "mineralogy:slabs/amphibolite/smooth" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:amphibolite_smooth_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ] + "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 31ea0fc5f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:amphibolite_smooth_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ] + } } 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 9a36f26bd..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:amphibolite_smooth" + "tag": "mineralogy:stones/amphibolite/smooth" } }, "result": { "item": "mineralogy:amphibolite_smooth_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ] + } } 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 4c44cbe32..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_smooth_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:amphibolite_smooth" + "tag": "mineralogy:stones/amphibolite/smooth" } }, "result": { "item": "mineralogy:amphibolite_smooth_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_stairs.json b/src/main/resources/data/mineralogy/recipes/amphibolite_stairs.json index c389eccf6..765f21bc0 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,17 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:amphibolite" + "tag": "mineralogy:stones/amphibolite" } }, "result": { "item": "mineralogy:amphibolite_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] + } } 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 9d6652731..000000000 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_stairs_from_amphibolite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:amphibolite" - }, - "result": "mineralogy:amphibolite_stairs", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/amphibolite_wall.json b/src/main/resources/data/mineralogy/recipes/amphibolite_wall.json index c398ffaae..c6797de98 100644 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/amphibolite_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:amphibolite_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:amphibolite" + "tag": "mineralogy:stones/amphibolite" } }, "result": { "item": "mineralogy:amphibolite_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] + } } 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 304d8453d..000000000 --- a/src/main/resources/data/mineralogy/recipes/amphibolite_wall_from_amphibolite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:amphibolite" - }, - "result": "mineralogy:amphibolite_wall", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_brick.json b/src/main/resources/data/mineralogy/recipes/andesite_brick.json index 126f9f62b..4dd181564 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:andesite" + "tag": "mineralogy:stones/andesite" } }, "result": { "item": "mineralogy:andesite_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ] + } } 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 b4cd3af2b..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:andesite_brick_slab" + "tag": "mineralogy:slabs/andesite/brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:andesite_brick_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ] + "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 79dc9454d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:andesite_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ] + } } 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 b554926b1..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:andesite_brick" + "tag": "mineralogy:stones/andesite/brick" } }, "result": { "item": "mineralogy:andesite_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ] + } } 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 f99f6e24f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:andesite_brick" + "tag": "mineralogy:stones/andesite/brick" } }, "result": { "item": "mineralogy:andesite_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ] + } } 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 e3ca84962..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": [ { - "item": "mineralogy:andesite" + "tag": "mineralogy:stones/andesite" }, { - "item": "mineralogy: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 64af9d1da..b8f6c7d6a 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,23 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:andesite_slab" + "tag": "mineralogy:slabs/andesite" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:andesite_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] + "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 b16447ac6..000000000 --- a/src/main/resources/data/mineralogy/recipes/andesite_furnace_from_rock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:andesite" - } - }, - "result": { - "item": "mineralogy:andesite_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] -} 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 95f550795..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_axe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:andesite_relief_axe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 c3b7f80e5..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_blank" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:andesite_relief_blank", "count": 16 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 dc21a79eb..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_cross" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:andesite_relief_cross", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 47ddc35a1..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_hammer" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "zxz", @@ -19,15 +25,5 @@ "result": { "item": "mineralogy:andesite_relief_hammer", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 fd17df4b9..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_hoe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:andesite_relief_hoe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 a41abe8e9..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_horizontal" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:andesite_relief_horizontal", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 f72e433ac..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_i" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:andesite_relief_i", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 98bd5a4ca..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_left" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:andesite_relief_left", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 9b7531db9..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_pickaxe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:andesite_relief_pickaxe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 62060cb4f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_plus" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ " x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:andesite_relief_plus", "count": 5 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 76808349c..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,27 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:andesite_relief_left" - } - }, - "result": { - "item": "mineralogy:andesite_relief_right", - "count": 3 - }, "conditions": [ { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:andesite_relief_left" }, { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" + "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 133b64f6b..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_sword" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:andesite_relief_sword", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 93957150e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_relief_vertical" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:andesite_relief_vertical", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_slab.json b/src/main/resources/data/mineralogy/recipes/andesite_slab.json index 74deda423..fe295ce48 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,11 +17,5 @@ "result": { "item": "mineralogy:andesite_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] + } } 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 3fe9a4f6e..000000000 --- a/src/main/resources/data/mineralogy/recipes/andesite_slab_from_andesite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:andesite" - }, - "result": "mineralogy:andesite_slab", - "count": 2, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_smooth.json b/src/main/resources/data/mineralogy/recipes/andesite_smooth.json index 4743f2918..4abb67516 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_smooth.json @@ -1,20 +1,21 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:andesite" + "tag": "mineralogy:stones/andesite" }, { "item": "minecraft:sand" } ], "result": { - "item": "mineralogy:andesite_smooth" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ] + "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 5c6f09e17..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:andesite_smooth" + "tag": "mineralogy:stones/andesite/smooth" } }, "result": { "item": "mineralogy:andesite_smooth_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ] + } } 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 2c9a24cb0..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,31 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:andesite_smooth_brick_slab" + "tag": "mineralogy:slabs/andesite/smooth_brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:andesite_smooth_brick_furnace" - }, - "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" - } - ] + "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 5951b59a1..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,19 +17,5 @@ "result": { "item": "mineralogy:andesite_smooth_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ] + } } 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 7a698e143..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,25 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:andesite_smooth_brick" + "tag": "mineralogy:stones/andesite/smooth_brick" } }, "result": { "item": "mineralogy:andesite_smooth_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ] + } } 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 8fff30b90..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,25 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:andesite_smooth_brick" + "tag": "mineralogy:stones/andesite/smooth_brick" } }, "result": { "item": "mineralogy:andesite_smooth_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ] + } } 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 c53172273..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:andesite_smooth_slab" + "tag": "mineralogy:slabs/andesite/smooth" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:andesite_smooth_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ] + "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 11ae6c09a..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:andesite_smooth_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ] + } } 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 ba3359339..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:andesite_smooth" + "tag": "mineralogy:stones/andesite/smooth" } }, "result": { "item": "mineralogy:andesite_smooth_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ] + } } 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 370bd40ad..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_smooth_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:andesite_smooth" + "tag": "mineralogy:stones/andesite/smooth" } }, "result": { "item": "mineralogy:andesite_smooth_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/andesite_stairs.json b/src/main/resources/data/mineralogy/recipes/andesite_stairs.json index 9d2b24a24..1d49219e7 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,17 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:andesite" + "tag": "mineralogy:stones/andesite" } }, "result": { "item": "mineralogy:andesite_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] + } } 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 23b6205be..000000000 --- a/src/main/resources/data/mineralogy/recipes/andesite_stairs_from_andesite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:andesite" - }, - "result": "mineralogy:andesite_stairs", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/andesite_wall.json b/src/main/resources/data/mineralogy/recipes/andesite_wall.json index a5c7f54f7..332ca18d1 100644 --- a/src/main/resources/data/mineralogy/recipes/andesite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/andesite_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:andesite_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:andesite" + "tag": "mineralogy:stones/andesite" } }, "result": { "item": "mineralogy:andesite_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] + } } 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 8548af9f8..000000000 --- a/src/main/resources/data/mineralogy/recipes/andesite_wall_from_andesite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:andesite" - }, - "result": "mineralogy:andesite_wall", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/basalt_brick.json b/src/main/resources/data/mineralogy/recipes/basalt_brick.json index 438dc349c..2ee5e5514 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_brick.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:basalt" + "tag": "mineralogy:stones/basalt" } }, "result": { "item": "mineralogy:basalt_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ] + } } 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 701dbcf3e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:basalt_brick_slab" + "tag": "mineralogy:slabs/basalt/brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:basalt_brick_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ] + "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 56461087e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:basalt_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ] + } } 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 d122ed0d1..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:basalt_brick" + "tag": "mineralogy:stones/basalt/brick" } }, "result": { "item": "mineralogy:basalt_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ] + } } 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 5d594e6f8..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:basalt_brick" + "tag": "mineralogy:stones/basalt/brick" } }, "result": { "item": "mineralogy:basalt_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ] + } } 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 6aa064936..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": [ { - "item": "mineralogy:basalt" + "tag": "mineralogy:stones/basalt" }, { - "item": "mineralogy: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 9f79fd8f5..0effcad0a 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,23 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:basalt_slab" + "tag": "mineralogy:slabs/basalt" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:basalt_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] + "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 c265ed703..000000000 --- a/src/main/resources/data/mineralogy/recipes/basalt_furnace_from_rock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basalt" - } - }, - "result": { - "item": "mineralogy:basalt_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] -} 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 6d0dbb095..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_axe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:basalt_relief_axe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 90a6e8939..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_blank" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:basalt_relief_blank", "count": 16 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 c13d272e7..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_cross" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:basalt_relief_cross", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 149bfe2f7..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_hammer" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "zxz", @@ -19,15 +25,5 @@ "result": { "item": "mineralogy:basalt_relief_hammer", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 10f793d45..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_hoe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:basalt_relief_hoe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 51aa6b33e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_horizontal" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:basalt_relief_horizontal", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 ae1f37dfc..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_i" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:basalt_relief_i", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 1dc5b0f6d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_left" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:basalt_relief_left", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 2f6201d74..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_pickaxe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:basalt_relief_pickaxe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 19568ae1e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_plus" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ " x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:basalt_relief_plus", "count": 5 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 b42a2e31b..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,27 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:basalt_relief_left" - } - }, - "result": { - "item": "mineralogy:basalt_relief_right", - "count": 3 - }, "conditions": [ { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basalt_relief_left" }, { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" + "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 5b0230b5d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_sword" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:basalt_relief_sword", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 a36ec1097..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_relief_vertical" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:basalt_relief_vertical", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_slab.json b/src/main/resources/data/mineralogy/recipes/basalt_slab.json index da953c82a..bd04f195c 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_slab.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,11 +17,5 @@ "result": { "item": "mineralogy:basalt_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] + } } 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 c1573e3b7..000000000 --- a/src/main/resources/data/mineralogy/recipes/basalt_slab_from_basalt_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:basalt" - }, - "result": "mineralogy:basalt_slab", - "count": 2, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/basalt_smooth.json b/src/main/resources/data/mineralogy/recipes/basalt_smooth.json index 6eaca4f6a..877de7157 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_smooth.json @@ -1,20 +1,21 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:basalt" + "tag": "mineralogy:stones/basalt" }, { "item": "minecraft:sand" } ], "result": { - "item": "mineralogy:basalt_smooth" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ] + "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 bafd64a83..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:basalt_smooth" + "tag": "mineralogy:stones/basalt/smooth" } }, "result": { "item": "mineralogy:basalt_smooth_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ] + } } 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 963ab1811..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,31 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:basalt_smooth_brick_slab" + "tag": "mineralogy:slabs/basalt/smooth_brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:basalt_smooth_brick_furnace" - }, - "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" - } - ] + "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 909609e33..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,19 +17,5 @@ "result": { "item": "mineralogy:basalt_smooth_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ] + } } 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 8b4b201f4..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,25 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:basalt_smooth_brick" + "tag": "mineralogy:stones/basalt/smooth_brick" } }, "result": { "item": "mineralogy:basalt_smooth_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ] + } } 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 843fa5311..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,25 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:basalt_smooth_brick" + "tag": "mineralogy:stones/basalt/smooth_brick" } }, "result": { "item": "mineralogy:basalt_smooth_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ] + } } 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 8161f8d9e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:basalt_smooth_slab" + "tag": "mineralogy:slabs/basalt/smooth" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:basalt_smooth_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ] + "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 33acc1d48..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:basalt_smooth_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ] + } } 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 06453f066..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:basalt_smooth" + "tag": "mineralogy:stones/basalt/smooth" } }, "result": { "item": "mineralogy:basalt_smooth_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ] + } } 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 a81eae6d7..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_smooth_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:basalt_smooth" + "tag": "mineralogy:stones/basalt/smooth" } }, "result": { "item": "mineralogy:basalt_smooth_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/basalt_stairs.json b/src/main/resources/data/mineralogy/recipes/basalt_stairs.json index 9681a31af..0873978b6 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,17 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:basalt" + "tag": "mineralogy:stones/basalt" } }, "result": { "item": "mineralogy:basalt_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] + } } 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 1b66e290c..000000000 --- a/src/main/resources/data/mineralogy/recipes/basalt_stairs_from_basalt_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:basalt" - }, - "result": "mineralogy:basalt_stairs", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/basalt_wall.json b/src/main/resources/data/mineralogy/recipes/basalt_wall.json index f5df2bf23..f24c30d9c 100644 --- a/src/main/resources/data/mineralogy/recipes/basalt_wall.json +++ b/src/main/resources/data/mineralogy/recipes/basalt_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basalt_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:basalt" + "tag": "mineralogy:stones/basalt" } }, "result": { "item": "mineralogy:basalt_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] + } } 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 9e50412c8..000000000 --- a/src/main/resources/data/mineralogy/recipes/basalt_wall_from_basalt_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:basalt" - }, - "result": "mineralogy:basalt_wall", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] -} 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 b024b87f0..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:basaltic_glass" + "tag": "mineralogy:stones/basaltic_glass" } }, "result": { "item": "mineralogy:basaltic_glass_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ] + } } 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 88443a97e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:basaltic_glass_brick_slab" + "tag": "mineralogy:slabs/basaltic_glass/brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:basaltic_glass_brick_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ] + "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 451557f7d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:basaltic_glass_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ] + } } 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 88a07b21b..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:basaltic_glass_brick" + "tag": "mineralogy:stones/basaltic_glass/brick" } }, "result": { "item": "mineralogy:basaltic_glass_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ] + } } 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 10bc0f0bd..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:basaltic_glass_brick" + "tag": "mineralogy:stones/basaltic_glass/brick" } }, "result": { "item": "mineralogy:basaltic_glass_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ] + } } 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 aeac67035..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": [ { - "item": "mineralogy:basaltic_glass" + "tag": "mineralogy:stones/basaltic_glass" }, { - "item": "mineralogy: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 ca3f12aba..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,23 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:basaltic_glass_slab" + "tag": "mineralogy:slabs/basaltic_glass" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:basaltic_glass_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] + "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 251529abe..000000000 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_furnace_from_rock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:basaltic_glass" - } - }, - "result": { - "item": "mineralogy:basaltic_glass_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] -} 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 f93f84018..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_axe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:basaltic_glass_relief_axe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 ef303cf96..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_blank" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:basaltic_glass_relief_blank", "count": 16 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 ba7ecc313..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_cross" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:basaltic_glass_relief_cross", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 db3fab7cf..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_hammer" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "zxz", @@ -19,15 +25,5 @@ "result": { "item": "mineralogy:basaltic_glass_relief_hammer", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 284d1de3a..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_hoe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:basaltic_glass_relief_hoe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 6e4394a72..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_horizontal" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:basaltic_glass_relief_horizontal", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 5c87f79eb..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_i" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:basaltic_glass_relief_i", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 28798c199..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_left" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:basaltic_glass_relief_left", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 61cfe4221..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_pickaxe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:basaltic_glass_relief_pickaxe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 961dcbc57..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_plus" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ " x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:basaltic_glass_relief_plus", "count": 5 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 c7c79d088..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,27 +1,21 @@ { - "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 - }, "conditions": [ { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:basaltic_glass_relief_left" }, { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" + "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 c1afd2c3d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_sword" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:basaltic_glass_relief_sword", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 392754342..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_relief_vertical" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:basaltic_glass_relief_vertical", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 42ae54355..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,11 +17,5 @@ "result": { "item": "mineralogy:basaltic_glass_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] + } } 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 fbb1f8dde..000000000 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_slab_from_basaltic_glass_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:basaltic_glass" - }, - "result": "mineralogy:basaltic_glass_slab", - "count": 2, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] -} 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 f3a2abce2..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,20 +1,21 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:basaltic_glass" + "tag": "mineralogy:stones/basaltic_glass" }, { "item": "minecraft:sand" } ], "result": { - "item": "mineralogy:basaltic_glass_smooth" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ] + "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 b432423f8..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:basaltic_glass_smooth" + "tag": "mineralogy:stones/basaltic_glass/smooth" } }, "result": { "item": "mineralogy:basaltic_glass_smooth_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ] + } } 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 bde29a299..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,31 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:basaltic_glass_smooth_brick_slab" + "tag": "mineralogy:slabs/basaltic_glass/smooth_brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:basaltic_glass_smooth_brick_furnace" - }, - "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" - } - ] + "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 eb1b91a60..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,19 +17,5 @@ "result": { "item": "mineralogy:basaltic_glass_smooth_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ] + } } 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 eb166c4d1..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,25 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:basaltic_glass_smooth_brick" + "tag": "mineralogy:stones/basaltic_glass/smooth_brick" } }, "result": { "item": "mineralogy:basaltic_glass_smooth_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ] + } } 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 eece41ddb..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,25 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:basaltic_glass_smooth_brick" + "tag": "mineralogy:stones/basaltic_glass/smooth_brick" } }, "result": { "item": "mineralogy:basaltic_glass_smooth_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ] + } } 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 a2df9db27..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:basaltic_glass_smooth_slab" + "tag": "mineralogy:slabs/basaltic_glass/smooth" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:basaltic_glass_smooth_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ] + "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 46eeb4b95..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:basaltic_glass_smooth_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ] + } } 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 230ee2ef8..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:basaltic_glass_smooth" + "tag": "mineralogy:stones/basaltic_glass/smooth" } }, "result": { "item": "mineralogy:basaltic_glass_smooth_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ] + } } 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 8bd8fc483..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_smooth_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:basaltic_glass_smooth" + "tag": "mineralogy:stones/basaltic_glass/smooth" } }, "result": { "item": "mineralogy:basaltic_glass_smooth_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ] + } } 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 ac2e7e030..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,17 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:basaltic_glass" + "tag": "mineralogy:stones/basaltic_glass" } }, "result": { "item": "mineralogy:basaltic_glass_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] + } } 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 4e0f398c4..000000000 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_stairs_from_basaltic_glass_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:basaltic_glass" - }, - "result": "mineralogy:basaltic_glass_stairs", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] -} 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 0df2ff172..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:basaltic_glass_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:basaltic_glass" + "tag": "mineralogy:stones/basaltic_glass" } }, "result": { "item": "mineralogy:basaltic_glass_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] + } } 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 f7d3deb5f..000000000 --- a/src/main/resources/data/mineralogy/recipes/basaltic_glass_wall_from_basaltic_glass_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:basaltic_glass" - }, - "result": "mineralogy:basaltic_glass_wall", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/chalk.json b/src/main/resources/data/mineralogy/recipes/chalk.json index 1f7743e1e..3bd8ad215 100644 --- a/src/main/resources/data/mineralogy/recipes/chalk.json +++ b/src/main/resources/data/mineralogy/recipes/chalk.json @@ -1,15 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "forge:dusts/chalk" - } - }, - "result": { - "item": "mineralogy:chalk" - } + "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 2ea37b94f..bdfdcd818 100644 --- a/src/main/resources/data/mineralogy/recipes/chalk_dust.json +++ b/src/main/resources/data/mineralogy/recipes/chalk_dust.json @@ -1,12 +1,18 @@ { - "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 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 a994b45ff..dd1e961fb 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_brick.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:conglomerate" + "tag": "mineralogy:stones/conglomerate" } }, "result": { "item": "mineralogy:conglomerate_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ] + } } 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 c391201ef..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:conglomerate_brick_slab" + "tag": "mineralogy:slabs/conglomerate/brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:conglomerate_brick_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ] + "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 654e7a46a..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:conglomerate_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ] + } } 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 80d9c2b60..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:conglomerate_brick" + "tag": "mineralogy:stones/conglomerate/brick" } }, "result": { "item": "mineralogy:conglomerate_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ] + } } 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 63f0ec55e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:conglomerate_brick" + "tag": "mineralogy:stones/conglomerate/brick" } }, "result": { "item": "mineralogy:conglomerate_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ] + } } 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 1d15cc97f..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": [ { - "item": "mineralogy:conglomerate" + "tag": "mineralogy:stones/conglomerate" }, { - "item": "mineralogy: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 c1fbd1528..1a517d6b3 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,23 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:conglomerate_slab" + "tag": "mineralogy:slabs/conglomerate" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:conglomerate_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] + "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 9f7a375f9..000000000 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_furnace_from_rock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:conglomerate" - } - }, - "result": { - "item": "mineralogy:conglomerate_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] -} 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 fbbcca06c..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_axe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:conglomerate_relief_axe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 7973bef45..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_blank" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:conglomerate_relief_blank", "count": 16 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 9a8c2c904..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_cross" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:conglomerate_relief_cross", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 dbea49e9f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_hammer" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "zxz", @@ -19,15 +25,5 @@ "result": { "item": "mineralogy:conglomerate_relief_hammer", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 f1040495d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_hoe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:conglomerate_relief_hoe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 a9bc11513..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_horizontal" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:conglomerate_relief_horizontal", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 175792f46..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_i" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:conglomerate_relief_i", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 a7ee0f953..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_left" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:conglomerate_relief_left", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 9ea3dfc73..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_pickaxe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:conglomerate_relief_pickaxe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 6334fe6f2..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_plus" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ " x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:conglomerate_relief_plus", "count": 5 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 72049ef96..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,27 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:conglomerate_relief_left" - } - }, - "result": { - "item": "mineralogy:conglomerate_relief_right", - "count": 3 - }, "conditions": [ { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:conglomerate_relief_left" }, { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" + "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 1d54acada..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_sword" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:conglomerate_relief_sword", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 3d52fc76e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_relief_vertical" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:conglomerate_relief_vertical", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_slab.json b/src/main/resources/data/mineralogy/recipes/conglomerate_slab.json index 77bf3b6f3..ad6e150d9 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_slab.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,11 +17,5 @@ "result": { "item": "mineralogy:conglomerate_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] + } } 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 7d5e259ba..000000000 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_slab_from_conglomerate_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:conglomerate" - }, - "result": "mineralogy:conglomerate_slab", - "count": 2, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth.json b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth.json index acd335822..e8bfb17cc 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_smooth.json @@ -1,20 +1,21 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:conglomerate" + "tag": "mineralogy:stones/conglomerate" }, { "item": "minecraft:sand" } ], "result": { - "item": "mineralogy:conglomerate_smooth" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ] + "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 2214a9208..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:conglomerate_smooth" + "tag": "mineralogy:stones/conglomerate/smooth" } }, "result": { "item": "mineralogy:conglomerate_smooth_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ] + } } 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 3a54c8a08..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,31 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:conglomerate_smooth_brick_slab" + "tag": "mineralogy:slabs/conglomerate/smooth_brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:conglomerate_smooth_brick_furnace" - }, - "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" - } - ] + "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 72f67d490..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,19 +17,5 @@ "result": { "item": "mineralogy:conglomerate_smooth_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ] + } } 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 5d52c6dbb..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,25 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:conglomerate_smooth_brick" + "tag": "mineralogy:stones/conglomerate/smooth_brick" } }, "result": { "item": "mineralogy:conglomerate_smooth_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ] + } } 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 7fedac8a1..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,25 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:conglomerate_smooth_brick" + "tag": "mineralogy:stones/conglomerate/smooth_brick" } }, "result": { "item": "mineralogy:conglomerate_smooth_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ] + } } 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 d030f7cb9..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:conglomerate_smooth_slab" + "tag": "mineralogy:slabs/conglomerate/smooth" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:conglomerate_smooth_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ] + "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 851c79fd5..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:conglomerate_smooth_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ] + } } 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 0a88c5562..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:conglomerate_smooth" + "tag": "mineralogy:stones/conglomerate/smooth" } }, "result": { "item": "mineralogy:conglomerate_smooth_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ] + } } 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 1ed4d1c97..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_smooth_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:conglomerate_smooth" + "tag": "mineralogy:stones/conglomerate/smooth" } }, "result": { "item": "mineralogy:conglomerate_smooth_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_stairs.json b/src/main/resources/data/mineralogy/recipes/conglomerate_stairs.json index cffd9b276..14ab18f2f 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,17 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:conglomerate" + "tag": "mineralogy:stones/conglomerate" } }, "result": { "item": "mineralogy:conglomerate_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] + } } 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 3129c62a5..000000000 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_stairs_from_conglomerate_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:conglomerate" - }, - "result": "mineralogy:conglomerate_stairs", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/conglomerate_wall.json b/src/main/resources/data/mineralogy/recipes/conglomerate_wall.json index 3d03966ee..49acde432 100644 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_wall.json +++ b/src/main/resources/data/mineralogy/recipes/conglomerate_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:conglomerate_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:conglomerate" + "tag": "mineralogy:stones/conglomerate" } }, "result": { "item": "mineralogy:conglomerate_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] + } } 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 b2557c097..000000000 --- a/src/main/resources/data/mineralogy/recipes/conglomerate_wall_from_conglomerate_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:conglomerate" - }, - "result": "mineralogy:conglomerate_wall", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/diabase_brick.json b/src/main/resources/data/mineralogy/recipes/diabase_brick.json index 5fbb6dbab..bdb956b1c 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:diabase" + "tag": "mineralogy:stones/diabase" } }, "result": { "item": "mineralogy:diabase_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ] + } } 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 9d740a352..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:diabase_brick_slab" + "tag": "mineralogy:slabs/diabase/brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:diabase_brick_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ] + "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 fd4bf50fb..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:diabase_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ] + } } 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 ae363ff3c..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:diabase_brick" + "tag": "mineralogy:stones/diabase/brick" } }, "result": { "item": "mineralogy:diabase_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ] + } } 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 f0ed869be..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:diabase_brick" + "tag": "mineralogy:stones/diabase/brick" } }, "result": { "item": "mineralogy:diabase_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ] + } } 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 94a8909bf..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": [ { - "item": "mineralogy:diabase" + "tag": "mineralogy:stones/diabase" }, { - "item": "mineralogy: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 2f8a1a142..e5625c81a 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,23 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:diabase_slab" + "tag": "mineralogy:slabs/diabase" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:diabase_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] + "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 b8e19be71..000000000 --- a/src/main/resources/data/mineralogy/recipes/diabase_furnace_from_rock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diabase" - } - }, - "result": { - "item": "mineralogy:diabase_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] -} 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 c1eeeadf2..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_axe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:diabase_relief_axe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 1b5aa789e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_blank" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:diabase_relief_blank", "count": 16 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 3c89ebbca..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_cross" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:diabase_relief_cross", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 0cee8b346..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_hammer" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "zxz", @@ -19,15 +25,5 @@ "result": { "item": "mineralogy:diabase_relief_hammer", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 065013a19..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_hoe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:diabase_relief_hoe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 78093a109..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_horizontal" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:diabase_relief_horizontal", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 49db7502d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_i" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:diabase_relief_i", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 60db4452d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_left" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:diabase_relief_left", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 afff7d99a..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_pickaxe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:diabase_relief_pickaxe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 9aa9efce7..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_plus" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ " x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:diabase_relief_plus", "count": 5 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 94f319a72..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,27 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:diabase_relief_left" - } - }, - "result": { - "item": "mineralogy:diabase_relief_right", - "count": 3 - }, "conditions": [ { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diabase_relief_left" }, { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" + "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 86617ecd3..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_sword" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:diabase_relief_sword", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 0971aee77..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_relief_vertical" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:diabase_relief_vertical", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_slab.json b/src/main/resources/data/mineralogy/recipes/diabase_slab.json index b42f73707..b8c950396 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,11 +17,5 @@ "result": { "item": "mineralogy:diabase_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] + } } 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 c31e19338..000000000 --- a/src/main/resources/data/mineralogy/recipes/diabase_slab_from_diabase_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:diabase" - }, - "result": "mineralogy:diabase_slab", - "count": 2, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/diabase_smooth.json b/src/main/resources/data/mineralogy/recipes/diabase_smooth.json index 0bade6e45..875e7b4f0 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_smooth.json @@ -1,20 +1,21 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:diabase" + "tag": "mineralogy:stones/diabase" }, { "item": "minecraft:sand" } ], "result": { - "item": "mineralogy:diabase_smooth" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ] + "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 ab85eea43..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:diabase_smooth" + "tag": "mineralogy:stones/diabase/smooth" } }, "result": { "item": "mineralogy:diabase_smooth_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ] + } } 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 5e786a816..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,31 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:diabase_smooth_brick_slab" + "tag": "mineralogy:slabs/diabase/smooth_brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:diabase_smooth_brick_furnace" - }, - "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" - } - ] + "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 d974af9e3..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,19 +17,5 @@ "result": { "item": "mineralogy:diabase_smooth_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ] + } } 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 307f9a80d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,25 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:diabase_smooth_brick" + "tag": "mineralogy:stones/diabase/smooth_brick" } }, "result": { "item": "mineralogy:diabase_smooth_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ] + } } 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 c9cd5b46d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,25 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:diabase_smooth_brick" + "tag": "mineralogy:stones/diabase/smooth_brick" } }, "result": { "item": "mineralogy:diabase_smooth_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ] + } } 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 756c093a4..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:diabase_smooth_slab" + "tag": "mineralogy:slabs/diabase/smooth" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:diabase_smooth_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ] + "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 b01cf252d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:diabase_smooth_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ] + } } 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 0b5145b7d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:diabase_smooth" + "tag": "mineralogy:stones/diabase/smooth" } }, "result": { "item": "mineralogy:diabase_smooth_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ] + } } 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 80507d058..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_smooth_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:diabase_smooth" + "tag": "mineralogy:stones/diabase/smooth" } }, "result": { "item": "mineralogy:diabase_smooth_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/diabase_stairs.json b/src/main/resources/data/mineralogy/recipes/diabase_stairs.json index 9b184a3e9..c0db19828 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,17 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:diabase" + "tag": "mineralogy:stones/diabase" } }, "result": { "item": "mineralogy:diabase_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] + } } 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 ca78498aa..000000000 --- a/src/main/resources/data/mineralogy/recipes/diabase_stairs_from_diabase_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:diabase" - }, - "result": "mineralogy:diabase_stairs", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/diabase_wall.json b/src/main/resources/data/mineralogy/recipes/diabase_wall.json index 851b6ecc8..bb53fb526 100644 --- a/src/main/resources/data/mineralogy/recipes/diabase_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diabase_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diabase_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:diabase" + "tag": "mineralogy:stones/diabase" } }, "result": { "item": "mineralogy:diabase_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] + } } 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 30c2128a0..000000000 --- a/src/main/resources/data/mineralogy/recipes/diabase_wall_from_diabase_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:diabase" - }, - "result": "mineralogy:diabase_wall", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_brick.json b/src/main/resources/data/mineralogy/recipes/diorite_brick.json index ef73b93cf..c5159fd7a 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:diorite" + "tag": "mineralogy:stones/diorite" } }, "result": { "item": "mineralogy:diorite_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ] + } } 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 874c9fce5..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:diorite_brick_slab" + "tag": "mineralogy:slabs/diorite/brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:diorite_brick_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ] + "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 cce829413..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:diorite_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ] + } } 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 20cc3dcf5..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:diorite_brick" + "tag": "mineralogy:stones/diorite/brick" } }, "result": { "item": "mineralogy:diorite_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ] + } } 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 251ff6a56..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:diorite_brick" + "tag": "mineralogy:stones/diorite/brick" } }, "result": { "item": "mineralogy:diorite_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ] + } } 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 d45abbc04..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": [ { - "item": "mineralogy:diorite" + "tag": "mineralogy:stones/diorite" }, { - "item": "mineralogy: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 0793e94e5..3a48d90a1 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,23 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:diorite_slab" + "tag": "mineralogy:slabs/diorite" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:diorite_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] + "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 37dfeb500..000000000 --- a/src/main/resources/data/mineralogy/recipes/diorite_furnace_from_rock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:diorite" - } - }, - "result": { - "item": "mineralogy:diorite_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] -} 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 b0b69064f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_axe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:diorite_relief_axe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 7e779f1c9..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_blank" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:diorite_relief_blank", "count": 16 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 640676d2a..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_cross" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:diorite_relief_cross", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 cac33f182..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_hammer" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "zxz", @@ -19,15 +25,5 @@ "result": { "item": "mineralogy:diorite_relief_hammer", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 0fcb77be5..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_hoe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:diorite_relief_hoe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 98717521e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_horizontal" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:diorite_relief_horizontal", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 cc26b2439..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_i" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:diorite_relief_i", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 42c15b15b..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_left" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:diorite_relief_left", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 edb290c29..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_pickaxe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:diorite_relief_pickaxe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 3d4ea5d1e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_plus" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ " x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:diorite_relief_plus", "count": 5 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 614a02e20..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,27 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:diorite_relief_left" - } - }, - "result": { - "item": "mineralogy:diorite_relief_right", - "count": 3 - }, "conditions": [ { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:diorite_relief_left" }, { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" + "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 e2243b5fb..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_sword" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:diorite_relief_sword", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 cf0a649b6..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_relief_vertical" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:diorite_relief_vertical", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_slab.json b/src/main/resources/data/mineralogy/recipes/diorite_slab.json index 83cda0deb..44cfe3d6e 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,11 +17,5 @@ "result": { "item": "mineralogy:diorite_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] + } } 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 7d075e7ec..000000000 --- a/src/main/resources/data/mineralogy/recipes/diorite_slab_from_diorite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:diorite" - }, - "result": "mineralogy:diorite_slab", - "count": 2, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_smooth.json b/src/main/resources/data/mineralogy/recipes/diorite_smooth.json index 6fe16bfb0..e982dc9e9 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_smooth.json @@ -1,20 +1,21 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:diorite" + "tag": "mineralogy:stones/diorite" }, { "item": "minecraft:sand" } ], "result": { - "item": "mineralogy:diorite_smooth" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ] + "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 8d6f56d52..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:diorite_smooth" + "tag": "mineralogy:stones/diorite/smooth" } }, "result": { "item": "mineralogy:diorite_smooth_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ] + } } 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 c1a939759..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,31 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:diorite_smooth_brick_slab" + "tag": "mineralogy:slabs/diorite/smooth_brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:diorite_smooth_brick_furnace" - }, - "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" - } - ] + "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 bd77e25a9..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,19 +17,5 @@ "result": { "item": "mineralogy:diorite_smooth_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ] + } } 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 fc650d9e5..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,25 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:diorite_smooth_brick" + "tag": "mineralogy:stones/diorite/smooth_brick" } }, "result": { "item": "mineralogy:diorite_smooth_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ] + } } 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 2e02a110f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,25 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:diorite_smooth_brick" + "tag": "mineralogy:stones/diorite/smooth_brick" } }, "result": { "item": "mineralogy:diorite_smooth_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ] + } } 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 2e6a22cf3..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:diorite_smooth_slab" + "tag": "mineralogy:slabs/diorite/smooth" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:diorite_smooth_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ] + "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 b3659f7c6..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:diorite_smooth_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ] + } } 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 15b55de37..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:diorite_smooth" + "tag": "mineralogy:stones/diorite/smooth" } }, "result": { "item": "mineralogy:diorite_smooth_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ] + } } 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 d04f3b294..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_smooth_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:diorite_smooth" + "tag": "mineralogy:stones/diorite/smooth" } }, "result": { "item": "mineralogy:diorite_smooth_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/diorite_stairs.json b/src/main/resources/data/mineralogy/recipes/diorite_stairs.json index 39e03588e..cff9b0256 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,17 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:diorite" + "tag": "mineralogy:stones/diorite" } }, "result": { "item": "mineralogy:diorite_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] + } } 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 8a6c97221..000000000 --- a/src/main/resources/data/mineralogy/recipes/diorite_stairs_from_diorite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:diorite" - }, - "result": "mineralogy:diorite_stairs", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/diorite_wall.json b/src/main/resources/data/mineralogy/recipes/diorite_wall.json index b24e7994f..69df6abe9 100644 --- a/src/main/resources/data/mineralogy/recipes/diorite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/diorite_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:diorite_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:diorite" + "tag": "mineralogy:stones/diorite" } }, "result": { "item": "mineralogy:diorite_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] + } } 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 8350d470b..000000000 --- a/src/main/resources/data/mineralogy/recipes/diorite_wall_from_diorite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:diorite" - }, - "result": "mineralogy:diorite_wall", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_brick.json b/src/main/resources/data/mineralogy/recipes/dolomite_brick.json index a292ddb1e..63ccc6f0e 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:dolomite" + "tag": "mineralogy:stones/dolomite" } }, "result": { "item": "mineralogy:dolomite_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ] + } } 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 3571577f8..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:dolomite_brick_slab" + "tag": "mineralogy:slabs/dolomite/brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:dolomite_brick_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ] + "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 58c2bb769..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:dolomite_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ] + } } 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 6a1b77fac..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:dolomite_brick" + "tag": "mineralogy:stones/dolomite/brick" } }, "result": { "item": "mineralogy:dolomite_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ] + } } 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 45bee7c8f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:dolomite_brick" + "tag": "mineralogy:stones/dolomite/brick" } }, "result": { "item": "mineralogy:dolomite_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ] + } } 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 f3b62c5af..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": [ { - "item": "mineralogy:dolomite" + "tag": "mineralogy:stones/dolomite" }, { - "item": "mineralogy: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 15267126e..58ea4cbb4 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,23 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:dolomite_slab" + "tag": "mineralogy:slabs/dolomite" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:dolomite_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] + "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 3dbebb919..000000000 --- a/src/main/resources/data/mineralogy/recipes/dolomite_furnace_from_rock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:dolomite" - } - }, - "result": { - "item": "mineralogy:dolomite_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] -} 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 1464fea11..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_axe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:dolomite_relief_axe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 0389f53f2..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_blank" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:dolomite_relief_blank", "count": 16 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 d95d0ca65..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_cross" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:dolomite_relief_cross", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 69e034366..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_hammer" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "zxz", @@ -19,15 +25,5 @@ "result": { "item": "mineralogy:dolomite_relief_hammer", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 3d87b05e4..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_hoe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:dolomite_relief_hoe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 699a964ee..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_horizontal" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:dolomite_relief_horizontal", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 8a45bbb9d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_i" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:dolomite_relief_i", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 9b6b29fd8..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_left" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:dolomite_relief_left", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 21f7950aa..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_pickaxe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:dolomite_relief_pickaxe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 1ad10050d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_plus" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ " x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:dolomite_relief_plus", "count": 5 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 f21eb40b2..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,27 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:dolomite_relief_left" - } - }, - "result": { - "item": "mineralogy:dolomite_relief_right", - "count": 3 - }, "conditions": [ { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:dolomite_relief_left" }, { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" + "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 9ea1eeba4..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_sword" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:dolomite_relief_sword", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 fa8e572d8..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_relief_vertical" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:dolomite_relief_vertical", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_slab.json b/src/main/resources/data/mineralogy/recipes/dolomite_slab.json index 0af0aa2e3..b6a5dfd6a 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,11 +17,5 @@ "result": { "item": "mineralogy:dolomite_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] + } } 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 c4cda621b..000000000 --- a/src/main/resources/data/mineralogy/recipes/dolomite_slab_from_dolomite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:dolomite" - }, - "result": "mineralogy:dolomite_slab", - "count": 2, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_smooth.json b/src/main/resources/data/mineralogy/recipes/dolomite_smooth.json index 75657f45f..9d93d4121 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_smooth.json @@ -1,20 +1,21 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:dolomite" + "tag": "mineralogy:stones/dolomite" }, { "item": "minecraft:sand" } ], "result": { - "item": "mineralogy:dolomite_smooth" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ] + "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 b7517e3f9..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:dolomite_smooth" + "tag": "mineralogy:stones/dolomite/smooth" } }, "result": { "item": "mineralogy:dolomite_smooth_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ] + } } 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 1f5b1d590..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,31 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:dolomite_smooth_brick_slab" + "tag": "mineralogy:slabs/dolomite/smooth_brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:dolomite_smooth_brick_furnace" - }, - "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" - } - ] + "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 d104d9be2..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,19 +17,5 @@ "result": { "item": "mineralogy:dolomite_smooth_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ] + } } 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 a3b457697..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,25 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:dolomite_smooth_brick" + "tag": "mineralogy:stones/dolomite/smooth_brick" } }, "result": { "item": "mineralogy:dolomite_smooth_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ] + } } 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 877307c51..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,25 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:dolomite_smooth_brick" + "tag": "mineralogy:stones/dolomite/smooth_brick" } }, "result": { "item": "mineralogy:dolomite_smooth_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ] + } } 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 f90b57b31..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:dolomite_smooth_slab" + "tag": "mineralogy:slabs/dolomite/smooth" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:dolomite_smooth_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ] + "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 bad246623..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:dolomite_smooth_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ] + } } 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 4d3b6d7f8..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:dolomite_smooth" + "tag": "mineralogy:stones/dolomite/smooth" } }, "result": { "item": "mineralogy:dolomite_smooth_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ] + } } 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 ad6b490ff..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_smooth_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:dolomite_smooth" + "tag": "mineralogy:stones/dolomite/smooth" } }, "result": { "item": "mineralogy:dolomite_smooth_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_stairs.json b/src/main/resources/data/mineralogy/recipes/dolomite_stairs.json index ecf8df4f3..92cbcd26f 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,17 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:dolomite" + "tag": "mineralogy:stones/dolomite" } }, "result": { "item": "mineralogy:dolomite_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] + } } 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 15cd71a2c..000000000 --- a/src/main/resources/data/mineralogy/recipes/dolomite_stairs_from_dolomite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:dolomite" - }, - "result": "mineralogy:dolomite_stairs", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/dolomite_wall.json b/src/main/resources/data/mineralogy/recipes/dolomite_wall.json index d46fb84fe..1a1e383db 100644 --- a/src/main/resources/data/mineralogy/recipes/dolomite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/dolomite_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:dolomite_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:dolomite" + "tag": "mineralogy:stones/dolomite" } }, "result": { "item": "mineralogy:dolomite_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] + } } 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 ce6f8f600..000000000 --- a/src/main/resources/data/mineralogy/recipes/dolomite_wall_from_dolomite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:dolomite" - }, - "result": "mineralogy:dolomite_wall", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/drywall.json b/src/main/resources/data/mineralogy/recipes/drywall.json index ad558a2f5..7027c0062 100644 --- a/src/main/resources/data/mineralogy/recipes/drywall.json +++ b/src/main/resources/data/mineralogy/recipes/drywall.json @@ -1,20 +1,30 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "pgp", - "pgp", - "pgp" - ], - "key": { - "p": { - "item": "minecraft: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 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 96c75524f..379201f4b 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:gabbro" + "tag": "mineralogy:stones/gabbro" } }, "result": { "item": "mineralogy:gabbro_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ] + } } 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 70125a5c6..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:gabbro_brick_slab" + "tag": "mineralogy:slabs/gabbro/brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:gabbro_brick_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ] + "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 e4a9069eb..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:gabbro_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ] + } } 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 57d2ff477..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:gabbro_brick" + "tag": "mineralogy:stones/gabbro/brick" } }, "result": { "item": "mineralogy:gabbro_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ] + } } 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 13764b82a..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:gabbro_brick" + "tag": "mineralogy:stones/gabbro/brick" } }, "result": { "item": "mineralogy:gabbro_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ] + } } 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 6f070525c..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": [ { - "item": "mineralogy:gabbro" + "tag": "mineralogy:stones/gabbro" }, { - "item": "mineralogy: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 0c3a23025..35383a938 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,23 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:gabbro_slab" + "tag": "mineralogy:slabs/gabbro" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:gabbro_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] + "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 650160b11..000000000 --- a/src/main/resources/data/mineralogy/recipes/gabbro_furnace_from_rock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gabbro" - } - }, - "result": { - "item": "mineralogy:gabbro_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] -} 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 1380dfc51..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_axe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:gabbro_relief_axe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 0adbe86f8..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_blank" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:gabbro_relief_blank", "count": 16 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 816d7e985..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_cross" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:gabbro_relief_cross", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 61d2171c5..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_hammer" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "zxz", @@ -19,15 +25,5 @@ "result": { "item": "mineralogy:gabbro_relief_hammer", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 a95e3a5be..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_hoe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:gabbro_relief_hoe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 41230c615..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_horizontal" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:gabbro_relief_horizontal", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 dac3093ea..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_i" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:gabbro_relief_i", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 f99dad8f2..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_left" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:gabbro_relief_left", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 f272cd354..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_pickaxe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:gabbro_relief_pickaxe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 f7dcae4f8..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_plus" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ " x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:gabbro_relief_plus", "count": 5 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 1e6e8b6b5..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,27 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:gabbro_relief_left" - } - }, - "result": { - "item": "mineralogy:gabbro_relief_right", - "count": 3 - }, "conditions": [ { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gabbro_relief_left" }, { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" + "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 4906e7a07..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_sword" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:gabbro_relief_sword", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 3781dfcbe..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_relief_vertical" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:gabbro_relief_vertical", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_slab.json b/src/main/resources/data/mineralogy/recipes/gabbro_slab.json index 4dffedc08..e3d87e3e8 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,11 +17,5 @@ "result": { "item": "mineralogy:gabbro_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] + } } 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 dd3021729..000000000 --- a/src/main/resources/data/mineralogy/recipes/gabbro_slab_from_gabbro_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:gabbro" - }, - "result": "mineralogy:gabbro_slab", - "count": 2, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_smooth.json b/src/main/resources/data/mineralogy/recipes/gabbro_smooth.json index 636c423fb..d1455be2a 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_smooth.json @@ -1,20 +1,21 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:gabbro" + "tag": "mineralogy:stones/gabbro" }, { "item": "minecraft:sand" } ], "result": { - "item": "mineralogy:gabbro_smooth" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ] + "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 dcf4bea24..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:gabbro_smooth" + "tag": "mineralogy:stones/gabbro/smooth" } }, "result": { "item": "mineralogy:gabbro_smooth_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ] + } } 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 ecdd51f5d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,31 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:gabbro_smooth_brick_slab" + "tag": "mineralogy:slabs/gabbro/smooth_brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:gabbro_smooth_brick_furnace" - }, - "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" - } - ] + "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 d225b8a52..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,19 +17,5 @@ "result": { "item": "mineralogy:gabbro_smooth_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ] + } } 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 19bc5a409..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,25 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:gabbro_smooth_brick" + "tag": "mineralogy:stones/gabbro/smooth_brick" } }, "result": { "item": "mineralogy:gabbro_smooth_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ] + } } 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 592c6d6f1..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,25 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:gabbro_smooth_brick" + "tag": "mineralogy:stones/gabbro/smooth_brick" } }, "result": { "item": "mineralogy:gabbro_smooth_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ] + } } 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 f628c286f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:gabbro_smooth_slab" + "tag": "mineralogy:slabs/gabbro/smooth" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:gabbro_smooth_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ] + "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 7795db083..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:gabbro_smooth_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ] + } } 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 0487230f3..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:gabbro_smooth" + "tag": "mineralogy:stones/gabbro/smooth" } }, "result": { "item": "mineralogy:gabbro_smooth_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ] + } } 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 5451b6b5b..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_smooth_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:gabbro_smooth" + "tag": "mineralogy:stones/gabbro/smooth" } }, "result": { "item": "mineralogy:gabbro_smooth_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_stairs.json b/src/main/resources/data/mineralogy/recipes/gabbro_stairs.json index e3d58e014..ce1bc20e7 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,17 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:gabbro" + "tag": "mineralogy:stones/gabbro" } }, "result": { "item": "mineralogy:gabbro_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] + } } 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 998f82eaa..000000000 --- a/src/main/resources/data/mineralogy/recipes/gabbro_stairs_from_gabbro_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:gabbro" - }, - "result": "mineralogy:gabbro_stairs", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/gabbro_wall.json b/src/main/resources/data/mineralogy/recipes/gabbro_wall.json index afd54d34f..e612e12a1 100644 --- a/src/main/resources/data/mineralogy/recipes/gabbro_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gabbro_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gabbro_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:gabbro" + "tag": "mineralogy:stones/gabbro" } }, "result": { "item": "mineralogy:gabbro_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] + } } 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 747b27afa..000000000 --- a/src/main/resources/data/mineralogy/recipes/gabbro_wall_from_gabbro_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:gabbro" - }, - "result": "mineralogy:gabbro_wall", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_brick.json b/src/main/resources/data/mineralogy/recipes/gneiss_brick.json index 79cda738b..ce546be28 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_brick.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:gneiss" + "tag": "mineralogy:stones/gneiss" } }, "result": { "item": "mineralogy:gneiss_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ] + } } 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 37e48c932..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:gneiss_brick_slab" + "tag": "mineralogy:slabs/gneiss/brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:gneiss_brick_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ] + "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 5e91e02b9..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:gneiss_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ] + } } 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 c52d0f9d4..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:gneiss_brick" + "tag": "mineralogy:stones/gneiss/brick" } }, "result": { "item": "mineralogy:gneiss_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ] + } } 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 d90c60774..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:gneiss_brick" + "tag": "mineralogy:stones/gneiss/brick" } }, "result": { "item": "mineralogy:gneiss_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ] + } } 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 f3cff9fe9..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": [ { - "item": "mineralogy:gneiss" + "tag": "mineralogy:stones/gneiss" }, { - "item": "mineralogy: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 e834d5733..d078c9f4a 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,23 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:gneiss_slab" + "tag": "mineralogy:slabs/gneiss" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:gneiss_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] + "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 e90015c54..000000000 --- a/src/main/resources/data/mineralogy/recipes/gneiss_furnace_from_rock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:gneiss" - } - }, - "result": { - "item": "mineralogy:gneiss_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] -} 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 faac7dcf3..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_axe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:gneiss_relief_axe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 bb185241d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_blank" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:gneiss_relief_blank", "count": 16 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 77af12484..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_cross" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:gneiss_relief_cross", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 cb141aa62..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_hammer" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "zxz", @@ -19,15 +25,5 @@ "result": { "item": "mineralogy:gneiss_relief_hammer", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 f336646ea..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_hoe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:gneiss_relief_hoe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 01497b399..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_horizontal" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:gneiss_relief_horizontal", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 98ac2e7c2..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_i" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:gneiss_relief_i", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 e80dd5f92..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_left" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:gneiss_relief_left", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 35a4fbf36..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_pickaxe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:gneiss_relief_pickaxe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 1d705e1b9..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_plus" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ " x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:gneiss_relief_plus", "count": 5 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 e77977177..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,27 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:gneiss_relief_left" - } - }, - "result": { - "item": "mineralogy:gneiss_relief_right", - "count": 3 - }, "conditions": [ { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:gneiss_relief_left" }, { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" + "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 d27a9ddcb..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_sword" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:gneiss_relief_sword", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 10265eb63..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_relief_vertical" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:gneiss_relief_vertical", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_slab.json b/src/main/resources/data/mineralogy/recipes/gneiss_slab.json index abd7d4ed8..46b03e71e 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_slab.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,11 +17,5 @@ "result": { "item": "mineralogy:gneiss_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] + } } 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 337897b46..000000000 --- a/src/main/resources/data/mineralogy/recipes/gneiss_slab_from_gneiss_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:gneiss" - }, - "result": "mineralogy:gneiss_slab", - "count": 2, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_smooth.json b/src/main/resources/data/mineralogy/recipes/gneiss_smooth.json index 15024ae09..0ae5b638a 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_smooth.json @@ -1,20 +1,21 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:gneiss" + "tag": "mineralogy:stones/gneiss" }, { "item": "minecraft:sand" } ], "result": { - "item": "mineralogy:gneiss_smooth" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ] + "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 9645376c3..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:gneiss_smooth" + "tag": "mineralogy:stones/gneiss/smooth" } }, "result": { "item": "mineralogy:gneiss_smooth_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ] + } } 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 c0465d40f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,31 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:gneiss_smooth_brick_slab" + "tag": "mineralogy:slabs/gneiss/smooth_brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:gneiss_smooth_brick_furnace" - }, - "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" - } - ] + "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 fd00903b1..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,19 +17,5 @@ "result": { "item": "mineralogy:gneiss_smooth_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ] + } } 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 2dbb6d7fe..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,25 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:gneiss_smooth_brick" + "tag": "mineralogy:stones/gneiss/smooth_brick" } }, "result": { "item": "mineralogy:gneiss_smooth_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ] + } } 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 aedd16f28..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,25 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:gneiss_smooth_brick" + "tag": "mineralogy:stones/gneiss/smooth_brick" } }, "result": { "item": "mineralogy:gneiss_smooth_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ] + } } 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 2ef8f4c43..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:gneiss_smooth_slab" + "tag": "mineralogy:slabs/gneiss/smooth" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:gneiss_smooth_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ] + "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 d1dec2460..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:gneiss_smooth_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ] + } } 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 ba4fdfb70..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:gneiss_smooth" + "tag": "mineralogy:stones/gneiss/smooth" } }, "result": { "item": "mineralogy:gneiss_smooth_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ] + } } 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 67616022e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_smooth_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:gneiss_smooth" + "tag": "mineralogy:stones/gneiss/smooth" } }, "result": { "item": "mineralogy:gneiss_smooth_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_stairs.json b/src/main/resources/data/mineralogy/recipes/gneiss_stairs.json index 7787f4fc9..1f9cb9268 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,17 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:gneiss" + "tag": "mineralogy:stones/gneiss" } }, "result": { "item": "mineralogy:gneiss_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] + } } 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 215d58b5d..000000000 --- a/src/main/resources/data/mineralogy/recipes/gneiss_stairs_from_gneiss_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:gneiss" - }, - "result": "mineralogy:gneiss_stairs", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/gneiss_wall.json b/src/main/resources/data/mineralogy/recipes/gneiss_wall.json index 7665fc113..ca3ca8476 100644 --- a/src/main/resources/data/mineralogy/recipes/gneiss_wall.json +++ b/src/main/resources/data/mineralogy/recipes/gneiss_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:gneiss_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:gneiss" + "tag": "mineralogy:stones/gneiss" } }, "result": { "item": "mineralogy:gneiss_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] + } } 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 c66ab2c4d..000000000 --- a/src/main/resources/data/mineralogy/recipes/gneiss_wall_from_gneiss_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:gneiss" - }, - "result": "mineralogy:gneiss_wall", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/granite_brick.json b/src/main/resources/data/mineralogy/recipes/granite_brick.json index e2dd2cf43..4fc4bc262 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/granite_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:granite" + "tag": "mineralogy:stones/granite" } }, "result": { "item": "mineralogy:granite_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ] + } } 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 d700306cd..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:granite_brick_slab" + "tag": "mineralogy:slabs/granite/brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:granite_brick_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ] + "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 993f2072c..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:granite_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ] + } } 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 9ae6aaee8..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:granite_brick" + "tag": "mineralogy:stones/granite/brick" } }, "result": { "item": "mineralogy:granite_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ] + } } 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 685fd80ff..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:granite_brick" + "tag": "mineralogy:stones/granite/brick" } }, "result": { "item": "mineralogy:granite_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ] + } } 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 98c232a98..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": [ { - "item": "mineralogy:granite" + "tag": "mineralogy:stones/granite" }, { - "item": "mineralogy: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 d68788801..faf2765ab 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/granite_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,23 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:granite_slab" + "tag": "mineralogy:slabs/granite" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:granite_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] + "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 ca3324b98..000000000 --- a/src/main/resources/data/mineralogy/recipes/granite_furnace_from_rock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:granite" - } - }, - "result": { - "item": "mineralogy:granite_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] -} 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 675b783b1..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_axe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:granite_relief_axe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 2211d1db7..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_blank" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:granite_relief_blank", "count": 16 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 02e66d732..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_cross" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:granite_relief_cross", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 1e7462452..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_hammer" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "zxz", @@ -19,15 +25,5 @@ "result": { "item": "mineralogy:granite_relief_hammer", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 bab557d32..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_hoe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:granite_relief_hoe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 740309d87..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_horizontal" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:granite_relief_horizontal", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 c2054dc75..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_i" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:granite_relief_i", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 f5955feb1..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_left" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:granite_relief_left", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 4448fef25..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_pickaxe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:granite_relief_pickaxe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 eca925017..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_plus" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ " x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:granite_relief_plus", "count": 5 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 93fa09320..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,27 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:granite_relief_left" - } - }, - "result": { - "item": "mineralogy:granite_relief_right", - "count": 3 - }, "conditions": [ { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:granite_relief_left" }, { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" + "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 e7387cd02..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_sword" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:granite_relief_sword", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 5e31d0dbb..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_relief_vertical" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:granite_relief_vertical", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_slab.json b/src/main/resources/data/mineralogy/recipes/granite_slab.json index 580950be9..3a0f24a46 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/granite_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,11 +17,5 @@ "result": { "item": "mineralogy:granite_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] + } } 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 599344b43..000000000 --- a/src/main/resources/data/mineralogy/recipes/granite_slab_from_granite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:granite" - }, - "result": "mineralogy:granite_slab", - "count": 2, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/granite_smooth.json b/src/main/resources/data/mineralogy/recipes/granite_smooth.json index 2dc4e6089..2cafcc7e6 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/granite_smooth.json @@ -1,20 +1,21 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:granite" + "tag": "mineralogy:stones/granite" }, { "item": "minecraft:sand" } ], "result": { - "item": "mineralogy:granite_smooth" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ] + "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 aab30388a..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:granite_smooth" + "tag": "mineralogy:stones/granite/smooth" } }, "result": { "item": "mineralogy:granite_smooth_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ] + } } 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 4a18ba669..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,31 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:granite_smooth_brick_slab" + "tag": "mineralogy:slabs/granite/smooth_brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:granite_smooth_brick_furnace" - }, - "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" - } - ] + "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 082ce1cca..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,19 +17,5 @@ "result": { "item": "mineralogy:granite_smooth_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ] + } } 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 9c42f01ce..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,25 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:granite_smooth_brick" + "tag": "mineralogy:stones/granite/smooth_brick" } }, "result": { "item": "mineralogy:granite_smooth_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ] + } } 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 b7de594ac..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,25 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:granite_smooth_brick" + "tag": "mineralogy:stones/granite/smooth_brick" } }, "result": { "item": "mineralogy:granite_smooth_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ] + } } 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 4bc05d5d6..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:granite_smooth_slab" + "tag": "mineralogy:slabs/granite/smooth" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:granite_smooth_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ] + "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 30abd1497..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:granite_smooth_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ] + } } 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 e1c0a6389..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:granite_smooth" + "tag": "mineralogy:stones/granite/smooth" } }, "result": { "item": "mineralogy:granite_smooth_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ] + } } 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 c09d4d876..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_smooth_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:granite_smooth" + "tag": "mineralogy:stones/granite/smooth" } }, "result": { "item": "mineralogy:granite_smooth_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/granite_stairs.json b/src/main/resources/data/mineralogy/recipes/granite_stairs.json index 42d7a8c9f..4c2120e34 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/granite_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,17 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:granite" + "tag": "mineralogy:stones/granite" } }, "result": { "item": "mineralogy:granite_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] + } } 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 b043ed6d7..000000000 --- a/src/main/resources/data/mineralogy/recipes/granite_stairs_from_granite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:granite" - }, - "result": "mineralogy:granite_stairs", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/granite_wall.json b/src/main/resources/data/mineralogy/recipes/granite_wall.json index fe571b128..5f2a48548 100644 --- a/src/main/resources/data/mineralogy/recipes/granite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/granite_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:granite_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:granite" + "tag": "mineralogy:stones/granite" } }, "result": { "item": "mineralogy:granite_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] + } } 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 e2340ee2b..000000000 --- a/src/main/resources/data/mineralogy/recipes/granite_wall_from_granite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:granite" - }, - "result": "mineralogy:granite_wall", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/gunpowder_from_carbon.json b/src/main/resources/data/mineralogy/recipes/gunpowder_from_carbon.json deleted file mode 100644 index be7cf427e..000000000 --- a/src/main/resources/data/mineralogy/recipes/gunpowder_from_carbon.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "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_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_charcoal.json b/src/main/resources/data/mineralogy/recipes/gunpowder_from_charcoal.json new file mode 100644 index 000000000..4d869dc4b --- /dev/null +++ b/src/main/resources/data/mineralogy/recipes/gunpowder_from_charcoal.json @@ -0,0 +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 + } +} 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 5ab282df4..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 e52ddbddc..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,18 +1,24 @@ { - "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 34f01557c..4e0b32977 100644 --- a/src/main/resources/data/mineralogy/recipes/gypsum.json +++ b/src/main/resources/data/mineralogy/recipes/gypsum.json @@ -1,16 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "forge:dusts/gypsum" - } - }, - "result": { - "item": "mineralogy:gypsum" - } + "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 8a71bf5a8..f6d26d2cd 100644 --- a/src/main/resources/data/mineralogy/recipes/gypsum_dust.json +++ b/src/main/resources/data/mineralogy/recipes/gypsum_dust.json @@ -1,12 +1,18 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/gypsum" - } - ], - "result": { - "item": "mineralogy:gypsum_dust", - "count": 9 - } + "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 f04515a9b..eaa1f1f9d 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_brick.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:hornfels" + "tag": "mineralogy:stones/hornfels" } }, "result": { "item": "mineralogy:hornfels_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ] + } } 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 ae2eb6c71..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:hornfels_brick_slab" + "tag": "mineralogy:slabs/hornfels/brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:hornfels_brick_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ] + "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 e87ee8938..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:hornfels_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ] + } } 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 8d9965572..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:hornfels_brick" + "tag": "mineralogy:stones/hornfels/brick" } }, "result": { "item": "mineralogy:hornfels_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ] + } } 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 c439739c9..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:hornfels_brick" + "tag": "mineralogy:stones/hornfels/brick" } }, "result": { "item": "mineralogy:hornfels_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ] + } } 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 b4b1c98ba..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": [ { - "item": "mineralogy:hornfels" + "tag": "mineralogy:stones/hornfels" }, { - "item": "mineralogy: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 9f213bea1..5ea26dcb0 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,23 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:hornfels_slab" + "tag": "mineralogy:slabs/hornfels" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:hornfels_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] + "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 a7ab978a7..000000000 --- a/src/main/resources/data/mineralogy/recipes/hornfels_furnace_from_rock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:hornfels" - } - }, - "result": { - "item": "mineralogy:hornfels_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] -} 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 acfd5c8a4..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_axe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:hornfels_relief_axe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 eeb108ba7..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_blank" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:hornfels_relief_blank", "count": 16 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 e41a3218e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_cross" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:hornfels_relief_cross", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 203c59a86..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_hammer" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "zxz", @@ -19,15 +25,5 @@ "result": { "item": "mineralogy:hornfels_relief_hammer", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 afea46774..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_hoe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:hornfels_relief_hoe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 1bf33e750..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_horizontal" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:hornfels_relief_horizontal", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 bf51d7db8..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_i" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:hornfels_relief_i", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 2fa70a293..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_left" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:hornfels_relief_left", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 7d56c2e06..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_pickaxe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:hornfels_relief_pickaxe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 ded7e51c9..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_plus" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ " x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:hornfels_relief_plus", "count": 5 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 44aa881c9..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,27 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:hornfels_relief_left" - } - }, - "result": { - "item": "mineralogy:hornfels_relief_right", - "count": 3 - }, "conditions": [ { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:hornfels_relief_left" }, { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" + "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 582b5da26..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_sword" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:hornfels_relief_sword", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 3a399598f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_relief_vertical" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:hornfels_relief_vertical", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_slab.json b/src/main/resources/data/mineralogy/recipes/hornfels_slab.json index 3182a4534..d97f745ed 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_slab.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,11 +17,5 @@ "result": { "item": "mineralogy:hornfels_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] + } } 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 0fb67a958..000000000 --- a/src/main/resources/data/mineralogy/recipes/hornfels_slab_from_hornfels_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:hornfels" - }, - "result": "mineralogy:hornfels_slab", - "count": 2, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_smooth.json b/src/main/resources/data/mineralogy/recipes/hornfels_smooth.json index 591107d37..e91cdf1dc 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_smooth.json @@ -1,20 +1,21 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:hornfels" + "tag": "mineralogy:stones/hornfels" }, { "item": "minecraft:sand" } ], "result": { - "item": "mineralogy:hornfels_smooth" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ] + "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 61941481c..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:hornfels_smooth" + "tag": "mineralogy:stones/hornfels/smooth" } }, "result": { "item": "mineralogy:hornfels_smooth_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ] + } } 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 a9f23888e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,31 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:hornfels_smooth_brick_slab" + "tag": "mineralogy:slabs/hornfels/smooth_brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:hornfels_smooth_brick_furnace" - }, - "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" - } - ] + "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 bbdf896bf..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,19 +17,5 @@ "result": { "item": "mineralogy:hornfels_smooth_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ] + } } 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 382842017..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,25 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:hornfels_smooth_brick" + "tag": "mineralogy:stones/hornfels/smooth_brick" } }, "result": { "item": "mineralogy:hornfels_smooth_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ] + } } 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 d13537989..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,25 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:hornfels_smooth_brick" + "tag": "mineralogy:stones/hornfels/smooth_brick" } }, "result": { "item": "mineralogy:hornfels_smooth_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ] + } } 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 637c2e8e6..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:hornfels_smooth_slab" + "tag": "mineralogy:slabs/hornfels/smooth" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:hornfels_smooth_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ] + "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 d936a9d3d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:hornfels_smooth_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ] + } } 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 a75b45296..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:hornfels_smooth" + "tag": "mineralogy:stones/hornfels/smooth" } }, "result": { "item": "mineralogy:hornfels_smooth_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ] + } } 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 c54613a6c..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_smooth_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:hornfels_smooth" + "tag": "mineralogy:stones/hornfels/smooth" } }, "result": { "item": "mineralogy:hornfels_smooth_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_stairs.json b/src/main/resources/data/mineralogy/recipes/hornfels_stairs.json index 6e57d612a..a27fa5620 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,17 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:hornfels" + "tag": "mineralogy:stones/hornfels" } }, "result": { "item": "mineralogy:hornfels_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] + } } 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 88445ee06..000000000 --- a/src/main/resources/data/mineralogy/recipes/hornfels_stairs_from_hornfels_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:hornfels" - }, - "result": "mineralogy:hornfels_stairs", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/hornfels_wall.json b/src/main/resources/data/mineralogy/recipes/hornfels_wall.json index c5cf95ed1..4d0ce9cd9 100644 --- a/src/main/resources/data/mineralogy/recipes/hornfels_wall.json +++ b/src/main/resources/data/mineralogy/recipes/hornfels_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:hornfels_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:hornfels" + "tag": "mineralogy:stones/hornfels" } }, "result": { "item": "mineralogy:hornfels_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] + } } 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 6294fe3d0..000000000 --- a/src/main/resources/data/mineralogy/recipes/hornfels_wall_from_hornfels_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:hornfels" - }, - "result": "mineralogy:hornfels_wall", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/limestone_brick.json b/src/main/resources/data/mineralogy/recipes/limestone_brick.json index 20d3ec351..e71c8b670 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_brick.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:limestone" + "tag": "mineralogy:stones/limestone" } }, "result": { "item": "mineralogy:limestone_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ] + } } 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 afb2bfd9c..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:limestone_brick_slab" + "tag": "mineralogy:slabs/limestone/brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:limestone_brick_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ] + "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 982ed20c3..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:limestone_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ] + } } 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 c5851564f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:limestone_brick" + "tag": "mineralogy:stones/limestone/brick" } }, "result": { "item": "mineralogy:limestone_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ] + } } 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 1b27ad3b0..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:limestone_brick" + "tag": "mineralogy:stones/limestone/brick" } }, "result": { "item": "mineralogy:limestone_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ] + } } 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 097fbc2d3..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": [ { - "item": "mineralogy:limestone" + "tag": "mineralogy:stones/limestone" }, { - "item": "mineralogy: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 b445f2dba..c73f48091 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,23 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:limestone_slab" + "tag": "mineralogy:slabs/limestone" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:limestone_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] + "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 a2f55a4aa..000000000 --- a/src/main/resources/data/mineralogy/recipes/limestone_furnace_from_rock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:limestone" - } - }, - "result": { - "item": "mineralogy:limestone_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] -} 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 f809cefa5..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_axe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:limestone_relief_axe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 ae122682a..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_blank" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:limestone_relief_blank", "count": 16 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 6c6feb519..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_cross" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:limestone_relief_cross", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 0deec0fe5..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_hammer" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "zxz", @@ -19,15 +25,5 @@ "result": { "item": "mineralogy:limestone_relief_hammer", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 7135f03eb..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_hoe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:limestone_relief_hoe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 92c5aa46d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_horizontal" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:limestone_relief_horizontal", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 068a16a93..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_i" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:limestone_relief_i", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 0d369cc64..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_left" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:limestone_relief_left", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 a1dc7c59f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_pickaxe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:limestone_relief_pickaxe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 c095db845..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_plus" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ " x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:limestone_relief_plus", "count": 5 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 a8d5093a8..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,27 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:limestone_relief_left" - } - }, - "result": { - "item": "mineralogy:limestone_relief_right", - "count": 3 - }, "conditions": [ { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:limestone_relief_left" }, { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" + "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 a2b3173e7..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_sword" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:limestone_relief_sword", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 b862c5c09..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_relief_vertical" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:limestone_relief_vertical", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_slab.json b/src/main/resources/data/mineralogy/recipes/limestone_slab.json index 8cc9bd3c9..7e4f5eaf4 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_slab.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,11 +17,5 @@ "result": { "item": "mineralogy:limestone_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] + } } 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 f772a529d..000000000 --- a/src/main/resources/data/mineralogy/recipes/limestone_slab_from_limestone_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:limestone" - }, - "result": "mineralogy:limestone_slab", - "count": 2, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/limestone_smooth.json b/src/main/resources/data/mineralogy/recipes/limestone_smooth.json index e0e22bd9a..f63744d97 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_smooth.json @@ -1,20 +1,21 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:limestone" + "tag": "mineralogy:stones/limestone" }, { "item": "minecraft:sand" } ], "result": { - "item": "mineralogy:limestone_smooth" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ] + "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 8e24a61a2..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:limestone_smooth" + "tag": "mineralogy:stones/limestone/smooth" } }, "result": { "item": "mineralogy:limestone_smooth_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ] + } } 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 14f1b2b02..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,31 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:limestone_smooth_brick_slab" + "tag": "mineralogy:slabs/limestone/smooth_brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:limestone_smooth_brick_furnace" - }, - "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" - } - ] + "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 f5ddb9692..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,19 +17,5 @@ "result": { "item": "mineralogy:limestone_smooth_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ] + } } 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 b19447bfc..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,25 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:limestone_smooth_brick" + "tag": "mineralogy:stones/limestone/smooth_brick" } }, "result": { "item": "mineralogy:limestone_smooth_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ] + } } 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 651bd73a4..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,25 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:limestone_smooth_brick" + "tag": "mineralogy:stones/limestone/smooth_brick" } }, "result": { "item": "mineralogy:limestone_smooth_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ] + } } 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 c048cdb45..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:limestone_smooth_slab" + "tag": "mineralogy:slabs/limestone/smooth" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:limestone_smooth_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ] + "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 51ba1536e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:limestone_smooth_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ] + } } 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 4b7b0e439..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:limestone_smooth" + "tag": "mineralogy:stones/limestone/smooth" } }, "result": { "item": "mineralogy:limestone_smooth_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ] + } } 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 e5e073abf..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_smooth_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:limestone_smooth" + "tag": "mineralogy:stones/limestone/smooth" } }, "result": { "item": "mineralogy:limestone_smooth_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/limestone_stairs.json b/src/main/resources/data/mineralogy/recipes/limestone_stairs.json index d26056714..2c3e4e0f1 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,17 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:limestone" + "tag": "mineralogy:stones/limestone" } }, "result": { "item": "mineralogy:limestone_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] + } } 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 237ff339b..000000000 --- a/src/main/resources/data/mineralogy/recipes/limestone_stairs_from_limestone_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:limestone" - }, - "result": "mineralogy:limestone_stairs", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/limestone_wall.json b/src/main/resources/data/mineralogy/recipes/limestone_wall.json index 71eb3dc62..2f06127f3 100644 --- a/src/main/resources/data/mineralogy/recipes/limestone_wall.json +++ b/src/main/resources/data/mineralogy/recipes/limestone_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:limestone_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:limestone" + "tag": "mineralogy:stones/limestone" } }, "result": { "item": "mineralogy:limestone_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] + } } 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 6101cc185..000000000 --- a/src/main/resources/data/mineralogy/recipes/limestone_wall_from_limestone_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:limestone" - }, - "result": "mineralogy:limestone_wall", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/marble_brick.json b/src/main/resources/data/mineralogy/recipes/marble_brick.json index bc83609d4..3d67176a1 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_brick.json +++ b/src/main/resources/data/mineralogy/recipes/marble_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:marble" + "tag": "mineralogy:stones/marble" } }, "result": { "item": "mineralogy:marble_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ] + } } 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 a54ee0c10..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:marble_brick_slab" + "tag": "mineralogy:slabs/marble/brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:marble_brick_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ] + "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 74c8c1fce..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:marble_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ] + } } 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 70e32452d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:marble_brick" + "tag": "mineralogy:stones/marble/brick" } }, "result": { "item": "mineralogy:marble_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ] + } } 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 ef1c60737..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:marble_brick" + "tag": "mineralogy:stones/marble/brick" } }, "result": { "item": "mineralogy:marble_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ] + } } 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 8e87e6765..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": [ { - "item": "mineralogy:marble" + "tag": "mineralogy:stones/marble" }, { - "item": "mineralogy: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 501fc64f3..0d001caac 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/marble_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,23 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:marble_slab" + "tag": "mineralogy:slabs/marble" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:marble_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] + "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 00fc9d679..000000000 --- a/src/main/resources/data/mineralogy/recipes/marble_furnace_from_rock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:marble" - } - }, - "result": { - "item": "mineralogy:marble_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] -} 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 3c29e5e16..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_axe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:marble_relief_axe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 0c01d8aa7..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_blank" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:marble_relief_blank", "count": 16 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 b74168b37..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_cross" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:marble_relief_cross", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 80682de09..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_hammer" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "zxz", @@ -19,15 +25,5 @@ "result": { "item": "mineralogy:marble_relief_hammer", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 e97867aaf..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_hoe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:marble_relief_hoe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 b8ca13c2f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_horizontal" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:marble_relief_horizontal", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 b391437a5..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_i" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:marble_relief_i", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 ff7cd7c85..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_left" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:marble_relief_left", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 d80feff8f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_pickaxe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:marble_relief_pickaxe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 06debccc3..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_plus" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ " x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:marble_relief_plus", "count": 5 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 2c81b2036..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,27 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:marble_relief_left" - } - }, - "result": { - "item": "mineralogy:marble_relief_right", - "count": 3 - }, "conditions": [ { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:marble_relief_left" }, { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" + "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 1579e47e0..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_sword" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:marble_relief_sword", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 84a74d5f1..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_relief_vertical" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:marble_relief_vertical", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_slab.json b/src/main/resources/data/mineralogy/recipes/marble_slab.json index e57b0c44a..8afe1b7d2 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_slab.json +++ b/src/main/resources/data/mineralogy/recipes/marble_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,11 +17,5 @@ "result": { "item": "mineralogy:marble_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] + } } 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 167b7ca06..000000000 --- a/src/main/resources/data/mineralogy/recipes/marble_slab_from_marble_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:marble" - }, - "result": "mineralogy:marble_slab", - "count": 2, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/marble_smooth.json b/src/main/resources/data/mineralogy/recipes/marble_smooth.json index deddc4dee..4571e7db8 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/marble_smooth.json @@ -1,20 +1,21 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:marble" + "tag": "mineralogy:stones/marble" }, { "item": "minecraft:sand" } ], "result": { - "item": "mineralogy:marble_smooth" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ] + "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 7cffee765..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:marble_smooth" + "tag": "mineralogy:stones/marble/smooth" } }, "result": { "item": "mineralogy:marble_smooth_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ] + } } 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 ef6b56754..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,31 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:marble_smooth_brick_slab" + "tag": "mineralogy:slabs/marble/smooth_brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:marble_smooth_brick_furnace" - }, - "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" - } - ] + "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 bd2c67ed3..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,19 +17,5 @@ "result": { "item": "mineralogy:marble_smooth_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ] + } } 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 d373a3b8f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,25 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:marble_smooth_brick" + "tag": "mineralogy:stones/marble/smooth_brick" } }, "result": { "item": "mineralogy:marble_smooth_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ] + } } 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 ae22c211e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,25 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:marble_smooth_brick" + "tag": "mineralogy:stones/marble/smooth_brick" } }, "result": { "item": "mineralogy:marble_smooth_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ] + } } 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 9d4044339..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:marble_smooth_slab" + "tag": "mineralogy:slabs/marble/smooth" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:marble_smooth_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ] + "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 a0b31b751..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:marble_smooth_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ] + } } 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 e16c81c9c..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:marble_smooth" + "tag": "mineralogy:stones/marble/smooth" } }, "result": { "item": "mineralogy:marble_smooth_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ] + } } 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 b1305dd29..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_smooth_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:marble_smooth" + "tag": "mineralogy:stones/marble/smooth" } }, "result": { "item": "mineralogy:marble_smooth_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/marble_stairs.json b/src/main/resources/data/mineralogy/recipes/marble_stairs.json index b2ad8940a..a8df994d8 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/marble_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,17 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:marble" + "tag": "mineralogy:stones/marble" } }, "result": { "item": "mineralogy:marble_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] + } } 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 ba3e7a7c7..000000000 --- a/src/main/resources/data/mineralogy/recipes/marble_stairs_from_marble_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:marble" - }, - "result": "mineralogy:marble_stairs", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/marble_wall.json b/src/main/resources/data/mineralogy/recipes/marble_wall.json index a933ffe6d..84e3f7c48 100644 --- a/src/main/resources/data/mineralogy/recipes/marble_wall.json +++ b/src/main/resources/data/mineralogy/recipes/marble_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:marble_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:marble" + "tag": "mineralogy:stones/marble" } }, "result": { "item": "mineralogy:marble_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] + } } 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 246f540fe..000000000 --- a/src/main/resources/data/mineralogy/recipes/marble_wall_from_marble_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:marble" - }, - "result": "mineralogy:marble_wall", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] -} 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 edae7096f..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 00350d87d..ffa4c4537 100644 --- a/src/main/resources/data/mineralogy/recipes/nitrate_block.json +++ b/src/main/resources/data/mineralogy/recipes/nitrate_block.json @@ -1,16 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "forge:dusts/nitrate" - } - }, - "result": { - "item": "mineralogy:nitrate_block" - } + "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 76ce1ff18..6ee3fe804 100644 --- a/src/main/resources/data/mineralogy/recipes/nitrate_dust.json +++ b/src/main/resources/data/mineralogy/recipes/nitrate_dust.json @@ -1,12 +1,22 @@ { - "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 464c36948..9d746be1a 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:novaculite" + "tag": "mineralogy:stones/novaculite" } }, "result": { "item": "mineralogy:novaculite_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ] + } } 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 a76b938a5..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:novaculite_brick_slab" + "tag": "mineralogy:slabs/novaculite/brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:novaculite_brick_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ] + "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 658162e5f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:novaculite_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ] + } } 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 54b1fbfe8..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:novaculite_brick" + "tag": "mineralogy:stones/novaculite/brick" } }, "result": { "item": "mineralogy:novaculite_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ] + } } 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 aa240d2ab..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:novaculite_brick" + "tag": "mineralogy:stones/novaculite/brick" } }, "result": { "item": "mineralogy:novaculite_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ] + } } 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 52fb2a9ba..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": [ { - "item": "mineralogy:novaculite" + "tag": "mineralogy:stones/novaculite" }, { - "item": "mineralogy: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 436791fca..33eeae7f6 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,23 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:novaculite_slab" + "tag": "mineralogy:slabs/novaculite" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:novaculite_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] + "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 b23f6a273..000000000 --- a/src/main/resources/data/mineralogy/recipes/novaculite_furnace_from_rock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:novaculite" - } - }, - "result": { - "item": "mineralogy:novaculite_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] -} 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 5d15c6198..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_axe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:novaculite_relief_axe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 f87d2b0cc..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_blank" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:novaculite_relief_blank", "count": 16 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 b2a98a116..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_cross" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:novaculite_relief_cross", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 0f9c343e8..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_hammer" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "zxz", @@ -19,15 +25,5 @@ "result": { "item": "mineralogy:novaculite_relief_hammer", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 d4b81e375..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_hoe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:novaculite_relief_hoe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 0dbad45ed..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_horizontal" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:novaculite_relief_horizontal", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 69750423b..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_i" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:novaculite_relief_i", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 ead02386d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_left" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:novaculite_relief_left", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 01a4cb086..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_pickaxe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:novaculite_relief_pickaxe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 30c5f2e52..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_plus" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ " x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:novaculite_relief_plus", "count": 5 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 5b3abcb80..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,27 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:novaculite_relief_left" - } - }, - "result": { - "item": "mineralogy:novaculite_relief_right", - "count": 3 - }, "conditions": [ { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:novaculite_relief_left" }, { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" + "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 eed96e8e9..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_sword" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:novaculite_relief_sword", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 27b158d63..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_relief_vertical" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:novaculite_relief_vertical", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_slab.json b/src/main/resources/data/mineralogy/recipes/novaculite_slab.json index b8aeb98c6..2f75d43ee 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,11 +17,5 @@ "result": { "item": "mineralogy:novaculite_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] + } } 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 1d657ab48..000000000 --- a/src/main/resources/data/mineralogy/recipes/novaculite_slab_from_novaculite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:novaculite" - }, - "result": "mineralogy:novaculite_slab", - "count": 2, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_smooth.json b/src/main/resources/data/mineralogy/recipes/novaculite_smooth.json index 04a4c4888..bab8c6e9a 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_smooth.json @@ -1,20 +1,21 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:novaculite" + "tag": "mineralogy:stones/novaculite" }, { "item": "minecraft:sand" } ], "result": { - "item": "mineralogy:novaculite_smooth" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ] + "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 25a487cdc..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:novaculite_smooth" + "tag": "mineralogy:stones/novaculite/smooth" } }, "result": { "item": "mineralogy:novaculite_smooth_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ] + } } 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 99153af28..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,31 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:novaculite_smooth_brick_slab" + "tag": "mineralogy:slabs/novaculite/smooth_brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:novaculite_smooth_brick_furnace" - }, - "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" - } - ] + "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 c97624253..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,19 +17,5 @@ "result": { "item": "mineralogy:novaculite_smooth_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ] + } } 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 cfbc78733..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,25 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:novaculite_smooth_brick" + "tag": "mineralogy:stones/novaculite/smooth_brick" } }, "result": { "item": "mineralogy:novaculite_smooth_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ] + } } 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 08e5da40a..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,25 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:novaculite_smooth_brick" + "tag": "mineralogy:stones/novaculite/smooth_brick" } }, "result": { "item": "mineralogy:novaculite_smooth_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ] + } } 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 5f6dd9d3d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:novaculite_smooth_slab" + "tag": "mineralogy:slabs/novaculite/smooth" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:novaculite_smooth_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ] + "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 2fd1ca955..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:novaculite_smooth_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ] + } } 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 06ca99b70..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:novaculite_smooth" + "tag": "mineralogy:stones/novaculite/smooth" } }, "result": { "item": "mineralogy:novaculite_smooth_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ] + } } 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 0e25e0737..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_smooth_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:novaculite_smooth" + "tag": "mineralogy:stones/novaculite/smooth" } }, "result": { "item": "mineralogy:novaculite_smooth_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_stairs.json b/src/main/resources/data/mineralogy/recipes/novaculite_stairs.json index b4438ece9..a08572c56 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,17 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:novaculite" + "tag": "mineralogy:stones/novaculite" } }, "result": { "item": "mineralogy:novaculite_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] + } } 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 297706053..000000000 --- a/src/main/resources/data/mineralogy/recipes/novaculite_stairs_from_novaculite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:novaculite" - }, - "result": "mineralogy:novaculite_stairs", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/novaculite_wall.json b/src/main/resources/data/mineralogy/recipes/novaculite_wall.json index 0972f8a70..1af81604c 100644 --- a/src/main/resources/data/mineralogy/recipes/novaculite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/novaculite_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:novaculite_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:novaculite" + "tag": "mineralogy:stones/novaculite" } }, "result": { "item": "mineralogy:novaculite_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] + } } 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 1e3e8a692..000000000 --- a/src/main/resources/data/mineralogy/recipes/novaculite_wall_from_novaculite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:novaculite" - }, - "result": "mineralogy:novaculite_wall", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_brick.json b/src/main/resources/data/mineralogy/recipes/pegmatite_brick.json index 782f1abcb..f8b6c2cdc 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:pegmatite" + "tag": "mineralogy:stones/pegmatite" } }, "result": { "item": "mineralogy:pegmatite_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ] + } } 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 50990eb80..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:pegmatite_brick_slab" + "tag": "mineralogy:slabs/pegmatite/brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:pegmatite_brick_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ] + "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 e18cf92b8..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:pegmatite_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ] + } } 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 5802a72c8..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:pegmatite_brick" + "tag": "mineralogy:stones/pegmatite/brick" } }, "result": { "item": "mineralogy:pegmatite_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ] + } } 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 c8062439b..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:pegmatite_brick" + "tag": "mineralogy:stones/pegmatite/brick" } }, "result": { "item": "mineralogy:pegmatite_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ] + } } 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 98607a707..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": [ { - "item": "mineralogy:pegmatite" + "tag": "mineralogy:stones/pegmatite" }, { - "item": "mineralogy: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 f52130d0b..6cae29c8d 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,23 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:pegmatite_slab" + "tag": "mineralogy:slabs/pegmatite" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:pegmatite_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] + "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 b6fd5d1c2..000000000 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_furnace_from_rock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:pegmatite" - } - }, - "result": { - "item": "mineralogy:pegmatite_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] -} 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 3471a1c52..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_axe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:pegmatite_relief_axe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 2f0378f84..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_blank" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:pegmatite_relief_blank", "count": 16 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 91506774d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_cross" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:pegmatite_relief_cross", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 bb4101fa7..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_hammer" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "zxz", @@ -19,15 +25,5 @@ "result": { "item": "mineralogy:pegmatite_relief_hammer", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 7f4964642..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_hoe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:pegmatite_relief_hoe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 d339ddd9f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_horizontal" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:pegmatite_relief_horizontal", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 323780318..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_i" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:pegmatite_relief_i", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 06b9ed41f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_left" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:pegmatite_relief_left", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 d90178bf0..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_pickaxe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:pegmatite_relief_pickaxe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 4c837fba8..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_plus" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ " x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:pegmatite_relief_plus", "count": 5 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 12a86a879..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,27 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:pegmatite_relief_left" - } - }, - "result": { - "item": "mineralogy:pegmatite_relief_right", - "count": 3 - }, "conditions": [ { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:pegmatite_relief_left" }, { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" + "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 3c164a3bb..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_sword" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:pegmatite_relief_sword", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 db6e363c9..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_relief_vertical" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:pegmatite_relief_vertical", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_slab.json b/src/main/resources/data/mineralogy/recipes/pegmatite_slab.json index 22b49a7c7..33b4276a2 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,11 +17,5 @@ "result": { "item": "mineralogy:pegmatite_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] + } } 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 060ebc0f3..000000000 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_slab_from_pegmatite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:pegmatite" - }, - "result": "mineralogy:pegmatite_slab", - "count": 2, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth.json b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth.json index 01b0b6f82..178032c8a 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_smooth.json @@ -1,20 +1,21 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:pegmatite" + "tag": "mineralogy:stones/pegmatite" }, { "item": "minecraft:sand" } ], "result": { - "item": "mineralogy:pegmatite_smooth" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ] + "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 5a248718e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:pegmatite_smooth" + "tag": "mineralogy:stones/pegmatite/smooth" } }, "result": { "item": "mineralogy:pegmatite_smooth_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ] + } } 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 b94af354a..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,31 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:pegmatite_smooth_brick_slab" + "tag": "mineralogy:slabs/pegmatite/smooth_brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:pegmatite_smooth_brick_furnace" - }, - "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" - } - ] + "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 034b30479..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,19 +17,5 @@ "result": { "item": "mineralogy:pegmatite_smooth_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ] + } } 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 f09480a88..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,25 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:pegmatite_smooth_brick" + "tag": "mineralogy:stones/pegmatite/smooth_brick" } }, "result": { "item": "mineralogy:pegmatite_smooth_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ] + } } 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 2c4f6087f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,25 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:pegmatite_smooth_brick" + "tag": "mineralogy:stones/pegmatite/smooth_brick" } }, "result": { "item": "mineralogy:pegmatite_smooth_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ] + } } 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 f89da7520..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:pegmatite_smooth_slab" + "tag": "mineralogy:slabs/pegmatite/smooth" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:pegmatite_smooth_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ] + "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 08b78de5a..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:pegmatite_smooth_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ] + } } 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 d4d2a1c16..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:pegmatite_smooth" + "tag": "mineralogy:stones/pegmatite/smooth" } }, "result": { "item": "mineralogy:pegmatite_smooth_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ] + } } 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 9ad0ae838..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_smooth_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:pegmatite_smooth" + "tag": "mineralogy:stones/pegmatite/smooth" } }, "result": { "item": "mineralogy:pegmatite_smooth_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_stairs.json b/src/main/resources/data/mineralogy/recipes/pegmatite_stairs.json index c525b11f2..ed97b6ce5 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,17 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:pegmatite" + "tag": "mineralogy:stones/pegmatite" } }, "result": { "item": "mineralogy:pegmatite_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] + } } 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 be876b093..000000000 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_stairs_from_pegmatite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:pegmatite" - }, - "result": "mineralogy:pegmatite_stairs", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/pegmatite_wall.json b/src/main/resources/data/mineralogy/recipes/pegmatite_wall.json index 9f7f29783..0439595f0 100644 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/pegmatite_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:pegmatite_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:pegmatite" + "tag": "mineralogy:stones/pegmatite" } }, "result": { "item": "mineralogy:pegmatite_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] + } } 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 c0b90a78b..000000000 --- a/src/main/resources/data/mineralogy/recipes/pegmatite_wall_from_pegmatite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:pegmatite" - }, - "result": "mineralogy:pegmatite_wall", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_brick.json b/src/main/resources/data/mineralogy/recipes/peridotite_brick.json index 08bb5df45..f4292382e 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:peridotite" + "tag": "mineralogy:stones/peridotite" } }, "result": { "item": "mineralogy:peridotite_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ] + } } 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 b10fb9cbe..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:peridotite_brick_slab" + "tag": "mineralogy:slabs/peridotite/brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:peridotite_brick_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ] + "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 ce23e84ca..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:peridotite_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ] + } } 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 14311fcbb..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:peridotite_brick" + "tag": "mineralogy:stones/peridotite/brick" } }, "result": { "item": "mineralogy:peridotite_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ] + } } 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 21848f7cc..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:peridotite_brick" + "tag": "mineralogy:stones/peridotite/brick" } }, "result": { "item": "mineralogy:peridotite_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ] + } } 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 982ddaa70..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": [ { - "item": "mineralogy:peridotite" + "tag": "mineralogy:stones/peridotite" }, { - "item": "mineralogy: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 212c53836..b9833b595 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,23 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:peridotite_slab" + "tag": "mineralogy:slabs/peridotite" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:peridotite_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] + "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 5b0e55cd8..000000000 --- a/src/main/resources/data/mineralogy/recipes/peridotite_furnace_from_rock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:peridotite" - } - }, - "result": { - "item": "mineralogy:peridotite_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] -} 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 7ca0087e0..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_axe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:peridotite_relief_axe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 e45f62657..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_blank" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:peridotite_relief_blank", "count": 16 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 4a8bd023d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_cross" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:peridotite_relief_cross", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 6c428cc61..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_hammer" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "zxz", @@ -19,15 +25,5 @@ "result": { "item": "mineralogy:peridotite_relief_hammer", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 765f7033d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_hoe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:peridotite_relief_hoe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 fbbd2ca34..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_horizontal" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:peridotite_relief_horizontal", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 410edae0f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_i" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:peridotite_relief_i", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 2c2dab27c..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_left" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:peridotite_relief_left", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 eab96efaa..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_pickaxe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:peridotite_relief_pickaxe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 f82162d1c..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_plus" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ " x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:peridotite_relief_plus", "count": 5 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 f856ce038..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,27 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:peridotite_relief_left" - } - }, - "result": { - "item": "mineralogy:peridotite_relief_right", - "count": 3 - }, "conditions": [ { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:peridotite_relief_left" }, { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" + "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 9132a4ff9..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_sword" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:peridotite_relief_sword", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 9a0b8995c..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_relief_vertical" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:peridotite_relief_vertical", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_slab.json b/src/main/resources/data/mineralogy/recipes/peridotite_slab.json index 20da13f3c..3a6e906ea 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,11 +17,5 @@ "result": { "item": "mineralogy:peridotite_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] + } } 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 df3c90ded..000000000 --- a/src/main/resources/data/mineralogy/recipes/peridotite_slab_from_peridotite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:peridotite" - }, - "result": "mineralogy:peridotite_slab", - "count": 2, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_smooth.json b/src/main/resources/data/mineralogy/recipes/peridotite_smooth.json index f02df1ee2..813f54d41 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_smooth.json @@ -1,20 +1,21 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:peridotite" + "tag": "mineralogy:stones/peridotite" }, { "item": "minecraft:sand" } ], "result": { - "item": "mineralogy:peridotite_smooth" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ] + "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 e18e4c6b0..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:peridotite_smooth" + "tag": "mineralogy:stones/peridotite/smooth" } }, "result": { "item": "mineralogy:peridotite_smooth_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ] + } } 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 544049438..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,31 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:peridotite_smooth_brick_slab" + "tag": "mineralogy:slabs/peridotite/smooth_brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:peridotite_smooth_brick_furnace" - }, - "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" - } - ] + "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 de411a196..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,19 +17,5 @@ "result": { "item": "mineralogy:peridotite_smooth_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ] + } } 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 34ae1e6f8..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,25 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:peridotite_smooth_brick" + "tag": "mineralogy:stones/peridotite/smooth_brick" } }, "result": { "item": "mineralogy:peridotite_smooth_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ] + } } 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 681e200c8..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,25 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:peridotite_smooth_brick" + "tag": "mineralogy:stones/peridotite/smooth_brick" } }, "result": { "item": "mineralogy:peridotite_smooth_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ] + } } 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 b7dbb5c53..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:peridotite_smooth_slab" + "tag": "mineralogy:slabs/peridotite/smooth" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:peridotite_smooth_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ] + "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 63052d774..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:peridotite_smooth_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ] + } } 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 ead77621b..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:peridotite_smooth" + "tag": "mineralogy:stones/peridotite/smooth" } }, "result": { "item": "mineralogy:peridotite_smooth_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ] + } } 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 98db5261c..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_smooth_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:peridotite_smooth" + "tag": "mineralogy:stones/peridotite/smooth" } }, "result": { "item": "mineralogy:peridotite_smooth_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_stairs.json b/src/main/resources/data/mineralogy/recipes/peridotite_stairs.json index 36793f654..d785eefb8 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,17 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:peridotite" + "tag": "mineralogy:stones/peridotite" } }, "result": { "item": "mineralogy:peridotite_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] + } } 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 9a7b2c34c..000000000 --- a/src/main/resources/data/mineralogy/recipes/peridotite_stairs_from_peridotite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:peridotite" - }, - "result": "mineralogy:peridotite_stairs", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/peridotite_wall.json b/src/main/resources/data/mineralogy/recipes/peridotite_wall.json index 1449ce663..a713e3d42 100644 --- a/src/main/resources/data/mineralogy/recipes/peridotite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/peridotite_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:peridotite_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:peridotite" + "tag": "mineralogy:stones/peridotite" } }, "result": { "item": "mineralogy:peridotite_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] + } } 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 c4cdbcdff..000000000 --- a/src/main/resources/data/mineralogy/recipes/peridotite_wall_from_peridotite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:peridotite" - }, - "result": "mineralogy:peridotite_wall", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/phosphorous_block.json b/src/main/resources/data/mineralogy/recipes/phosphorous_block.json index a08ce31dd..11a910cd5 100644 --- a/src/main/resources/data/mineralogy/recipes/phosphorous_block.json +++ b/src/main/resources/data/mineralogy/recipes/phosphorous_block.json @@ -1,16 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "forge:dusts/phosphorous" - } - }, - "result": { - "item": "mineralogy:phosphorous_block" - } + "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 57fc9eac6..ca2ad9d1a 100644 --- a/src/main/resources/data/mineralogy/recipes/phosphorous_dust.json +++ b/src/main/resources/data/mineralogy/recipes/phosphorous_dust.json @@ -1,12 +1,22 @@ { - "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 1a8a5861a..1366755d1 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:phyllite" + "tag": "mineralogy:stones/phyllite" } }, "result": { "item": "mineralogy:phyllite_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ] + } } 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 0db9985c7..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:phyllite_brick_slab" + "tag": "mineralogy:slabs/phyllite/brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:phyllite_brick_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ] + "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 51fd319a0..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:phyllite_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ] + } } 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 d3f7b79be..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:phyllite_brick" + "tag": "mineralogy:stones/phyllite/brick" } }, "result": { "item": "mineralogy:phyllite_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ] + } } 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 754b4ffbd..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:phyllite_brick" + "tag": "mineralogy:stones/phyllite/brick" } }, "result": { "item": "mineralogy:phyllite_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ] + } } 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 1b9fb4e56..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": [ { - "item": "mineralogy:phyllite" + "tag": "mineralogy:stones/phyllite" }, { - "item": "mineralogy: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 924c66977..084dd53e0 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,23 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:phyllite_slab" + "tag": "mineralogy:slabs/phyllite" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:phyllite_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] + "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 d4f10ad8d..000000000 --- a/src/main/resources/data/mineralogy/recipes/phyllite_furnace_from_rock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:phyllite" - } - }, - "result": { - "item": "mineralogy:phyllite_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] -} 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 a437c3df6..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_axe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:phyllite_relief_axe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 e20f2d114..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_blank" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:phyllite_relief_blank", "count": 16 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 d624d5eed..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_cross" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:phyllite_relief_cross", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 332f11933..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_hammer" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "zxz", @@ -19,15 +25,5 @@ "result": { "item": "mineralogy:phyllite_relief_hammer", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 6bb13dd44..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_hoe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:phyllite_relief_hoe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 98a276885..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_horizontal" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:phyllite_relief_horizontal", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 3ce906102..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_i" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:phyllite_relief_i", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 6fbfb7613..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_left" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:phyllite_relief_left", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 0ad5c1d39..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_pickaxe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:phyllite_relief_pickaxe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 79e60cff9..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_plus" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ " x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:phyllite_relief_plus", "count": 5 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 ef8c58e43..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,27 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:phyllite_relief_left" - } - }, - "result": { - "item": "mineralogy:phyllite_relief_right", - "count": 3 - }, "conditions": [ { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:phyllite_relief_left" }, { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" + "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 89d444c6b..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_sword" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:phyllite_relief_sword", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 440317642..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_relief_vertical" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:phyllite_relief_vertical", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_slab.json b/src/main/resources/data/mineralogy/recipes/phyllite_slab.json index 2663b0fb4..6602ce093 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,11 +17,5 @@ "result": { "item": "mineralogy:phyllite_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] + } } 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 bbbef2d39..000000000 --- a/src/main/resources/data/mineralogy/recipes/phyllite_slab_from_phyllite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:phyllite" - }, - "result": "mineralogy:phyllite_slab", - "count": 2, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_smooth.json b/src/main/resources/data/mineralogy/recipes/phyllite_smooth.json index 78b3e8e6a..b39bb2e35 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_smooth.json @@ -1,20 +1,21 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:phyllite" + "tag": "mineralogy:stones/phyllite" }, { "item": "minecraft:sand" } ], "result": { - "item": "mineralogy:phyllite_smooth" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ] + "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 e0532fbbf..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:phyllite_smooth" + "tag": "mineralogy:stones/phyllite/smooth" } }, "result": { "item": "mineralogy:phyllite_smooth_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ] + } } 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 db39e0b0d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,31 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:phyllite_smooth_brick_slab" + "tag": "mineralogy:slabs/phyllite/smooth_brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:phyllite_smooth_brick_furnace" - }, - "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" - } - ] + "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 416e0eeba..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,19 +17,5 @@ "result": { "item": "mineralogy:phyllite_smooth_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ] + } } 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 fea035389..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,25 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:phyllite_smooth_brick" + "tag": "mineralogy:stones/phyllite/smooth_brick" } }, "result": { "item": "mineralogy:phyllite_smooth_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ] + } } 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 b8191a48f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,25 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:phyllite_smooth_brick" + "tag": "mineralogy:stones/phyllite/smooth_brick" } }, "result": { "item": "mineralogy:phyllite_smooth_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ] + } } 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 132489e3a..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:phyllite_smooth_slab" + "tag": "mineralogy:slabs/phyllite/smooth" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:phyllite_smooth_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ] + "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 522fb431e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:phyllite_smooth_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ] + } } 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 c892ea882..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:phyllite_smooth" + "tag": "mineralogy:stones/phyllite/smooth" } }, "result": { "item": "mineralogy:phyllite_smooth_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ] + } } 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 fef2ba3f6..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_smooth_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:phyllite_smooth" + "tag": "mineralogy:stones/phyllite/smooth" } }, "result": { "item": "mineralogy:phyllite_smooth_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_stairs.json b/src/main/resources/data/mineralogy/recipes/phyllite_stairs.json index 79f878c95..335a21ec4 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,17 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:phyllite" + "tag": "mineralogy:stones/phyllite" } }, "result": { "item": "mineralogy:phyllite_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] + } } 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 0f6981a19..000000000 --- a/src/main/resources/data/mineralogy/recipes/phyllite_stairs_from_phyllite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:phyllite" - }, - "result": "mineralogy:phyllite_stairs", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/phyllite_wall.json b/src/main/resources/data/mineralogy/recipes/phyllite_wall.json index 54d539e71..0e9062186 100644 --- a/src/main/resources/data/mineralogy/recipes/phyllite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/phyllite_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:phyllite_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:phyllite" + "tag": "mineralogy:stones/phyllite" } }, "result": { "item": "mineralogy:phyllite_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] + } } 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 02d7e936d..000000000 --- a/src/main/resources/data/mineralogy/recipes/phyllite_wall_from_phyllite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:phyllite" - }, - "result": "mineralogy:phyllite_wall", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_brick.json b/src/main/resources/data/mineralogy/recipes/quartzite_brick.json index 4e5e30efd..ba748ecd3 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:quartzite" + "tag": "mineralogy:stones/quartzite" } }, "result": { "item": "mineralogy:quartzite_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ] + } } 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 46e04e7a4..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:quartzite_brick_slab" + "tag": "mineralogy:slabs/quartzite/brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:quartzite_brick_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ] + "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 701e609a5..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:quartzite_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ] + } } 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 621f213ba..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:quartzite_brick" + "tag": "mineralogy:stones/quartzite/brick" } }, "result": { "item": "mineralogy:quartzite_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ] + } } 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 0830edc90..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:quartzite_brick" + "tag": "mineralogy:stones/quartzite/brick" } }, "result": { "item": "mineralogy:quartzite_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ] + } } 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 d647f7fc4..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": [ { - "item": "mineralogy:quartzite" + "tag": "mineralogy:stones/quartzite" }, { - "item": "mineralogy: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 f44d403db..125fc5d62 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,23 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:quartzite_slab" + "tag": "mineralogy:slabs/quartzite" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:quartzite_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] + "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 4fd29a055..000000000 --- a/src/main/resources/data/mineralogy/recipes/quartzite_furnace_from_rock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:quartzite" - } - }, - "result": { - "item": "mineralogy:quartzite_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] -} 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 d5dfead0d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_axe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:quartzite_relief_axe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 0da5dfb47..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_blank" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:quartzite_relief_blank", "count": 16 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 28dada678..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_cross" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:quartzite_relief_cross", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 9ee9a8f09..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_hammer" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "zxz", @@ -19,15 +25,5 @@ "result": { "item": "mineralogy:quartzite_relief_hammer", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 81f0661d8..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_hoe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:quartzite_relief_hoe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 db22359d4..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_horizontal" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:quartzite_relief_horizontal", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 3ff42e357..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_i" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:quartzite_relief_i", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 9e9744e42..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_left" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:quartzite_relief_left", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 c2ed2a7de..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_pickaxe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:quartzite_relief_pickaxe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 299bc0ffb..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_plus" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ " x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:quartzite_relief_plus", "count": 5 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 405997040..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,27 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:quartzite_relief_left" - } - }, - "result": { - "item": "mineralogy:quartzite_relief_right", - "count": 3 - }, "conditions": [ { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:quartzite_relief_left" }, { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" + "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 12ecf3d22..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_sword" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:quartzite_relief_sword", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 5173638b8..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_relief_vertical" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:quartzite_relief_vertical", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_slab.json b/src/main/resources/data/mineralogy/recipes/quartzite_slab.json index b46b5da92..87b22089c 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,11 +17,5 @@ "result": { "item": "mineralogy:quartzite_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] + } } 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 f89dd6d05..000000000 --- a/src/main/resources/data/mineralogy/recipes/quartzite_slab_from_quartzite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:quartzite" - }, - "result": "mineralogy:quartzite_slab", - "count": 2, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_smooth.json b/src/main/resources/data/mineralogy/recipes/quartzite_smooth.json index 2d1748e0d..219601757 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_smooth.json @@ -1,20 +1,21 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:quartzite" + "tag": "mineralogy:stones/quartzite" }, { "item": "minecraft:sand" } ], "result": { - "item": "mineralogy:quartzite_smooth" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ] + "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 c6783a543..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:quartzite_smooth" + "tag": "mineralogy:stones/quartzite/smooth" } }, "result": { "item": "mineralogy:quartzite_smooth_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ] + } } 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 a0d9f5cb1..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,31 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:quartzite_smooth_brick_slab" + "tag": "mineralogy:slabs/quartzite/smooth_brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:quartzite_smooth_brick_furnace" - }, - "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" - } - ] + "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 b7c407440..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,19 +17,5 @@ "result": { "item": "mineralogy:quartzite_smooth_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ] + } } 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 bd5ca8ea3..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,25 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:quartzite_smooth_brick" + "tag": "mineralogy:stones/quartzite/smooth_brick" } }, "result": { "item": "mineralogy:quartzite_smooth_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ] + } } 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 e9915d7fc..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,25 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:quartzite_smooth_brick" + "tag": "mineralogy:stones/quartzite/smooth_brick" } }, "result": { "item": "mineralogy:quartzite_smooth_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ] + } } 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 685d12e98..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:quartzite_smooth_slab" + "tag": "mineralogy:slabs/quartzite/smooth" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:quartzite_smooth_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ] + "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 631bf430b..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:quartzite_smooth_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ] + } } 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 a0eca6793..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:quartzite_smooth" + "tag": "mineralogy:stones/quartzite/smooth" } }, "result": { "item": "mineralogy:quartzite_smooth_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ] + } } 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 e07054b3d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_smooth_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:quartzite_smooth" + "tag": "mineralogy:stones/quartzite/smooth" } }, "result": { "item": "mineralogy:quartzite_smooth_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_stairs.json b/src/main/resources/data/mineralogy/recipes/quartzite_stairs.json index 3ce12f6a5..7703c80a4 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,17 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:quartzite" + "tag": "mineralogy:stones/quartzite" } }, "result": { "item": "mineralogy:quartzite_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] + } } 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 70cf5d59f..000000000 --- a/src/main/resources/data/mineralogy/recipes/quartzite_stairs_from_quartzite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:quartzite" - }, - "result": "mineralogy:quartzite_stairs", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/quartzite_wall.json b/src/main/resources/data/mineralogy/recipes/quartzite_wall.json index a89db74b5..c94c15eb9 100644 --- a/src/main/resources/data/mineralogy/recipes/quartzite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/quartzite_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:quartzite_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:quartzite" + "tag": "mineralogy:stones/quartzite" } }, "result": { "item": "mineralogy:quartzite_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] + } } 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 a6c9be2ff..000000000 --- a/src/main/resources/data/mineralogy/recipes/quartzite_wall_from_quartzite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:quartzite" - }, - "result": "mineralogy:quartzite_wall", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_brick.json b/src/main/resources/data/mineralogy/recipes/rhyolite_brick.json index ef76d200f..61e53796a 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_brick.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:rhyolite" + "tag": "mineralogy:stones/rhyolite" } }, "result": { "item": "mineralogy:rhyolite_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ] + } } 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 3d09c8d69..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:rhyolite_brick_slab" + "tag": "mineralogy:slabs/rhyolite/brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:rhyolite_brick_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ] + "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 c027dc0b9..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:rhyolite_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ] + } } 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 68da290a1..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:rhyolite_brick" + "tag": "mineralogy:stones/rhyolite/brick" } }, "result": { "item": "mineralogy:rhyolite_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ] + } } 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 5d98fe106..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:rhyolite_brick" + "tag": "mineralogy:stones/rhyolite/brick" } }, "result": { "item": "mineralogy:rhyolite_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ] + } } 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 1470e61b7..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": [ { - "item": "mineralogy:rhyolite" + "tag": "mineralogy:stones/rhyolite" }, { - "item": "mineralogy: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 d833ddbc2..c4554d33f 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,23 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:rhyolite_slab" + "tag": "mineralogy:slabs/rhyolite" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:rhyolite_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] + "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 b4724d524..000000000 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_furnace_from_rock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rhyolite" - } - }, - "result": { - "item": "mineralogy:rhyolite_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] -} 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 06e2adc70..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_axe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:rhyolite_relief_axe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 04164a7e6..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_blank" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:rhyolite_relief_blank", "count": 16 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 a308d998e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_cross" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:rhyolite_relief_cross", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 db1157ab0..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_hammer" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "zxz", @@ -19,15 +25,5 @@ "result": { "item": "mineralogy:rhyolite_relief_hammer", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 c3f510820..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_hoe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:rhyolite_relief_hoe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 673e79b9f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_horizontal" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:rhyolite_relief_horizontal", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 3825e0e65..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_i" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:rhyolite_relief_i", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 9bbe485fd..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_left" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:rhyolite_relief_left", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 844b390e1..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_pickaxe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:rhyolite_relief_pickaxe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 fb03c18cc..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_plus" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ " x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:rhyolite_relief_plus", "count": 5 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 51658a0d5..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,27 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:rhyolite_relief_left" - } - }, - "result": { - "item": "mineralogy:rhyolite_relief_right", - "count": 3 - }, "conditions": [ { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rhyolite_relief_left" }, { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" + "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 ddc0e412f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_sword" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:rhyolite_relief_sword", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 18a4c1a25..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_relief_vertical" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:rhyolite_relief_vertical", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_slab.json b/src/main/resources/data/mineralogy/recipes/rhyolite_slab.json index 248d26643..c7132fd9e 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_slab.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,11 +17,5 @@ "result": { "item": "mineralogy:rhyolite_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] + } } 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 9b916ceee..000000000 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_slab_from_rhyolite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:rhyolite" - }, - "result": "mineralogy:rhyolite_slab", - "count": 2, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth.json b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth.json index 530571fa2..8c611b1d2 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_smooth.json @@ -1,20 +1,21 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:rhyolite" + "tag": "mineralogy:stones/rhyolite" }, { "item": "minecraft:sand" } ], "result": { - "item": "mineralogy:rhyolite_smooth" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ] + "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 964c3b0e3..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:rhyolite_smooth" + "tag": "mineralogy:stones/rhyolite/smooth" } }, "result": { "item": "mineralogy:rhyolite_smooth_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ] + } } 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 f2c9f07f8..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,31 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:rhyolite_smooth_brick_slab" + "tag": "mineralogy:slabs/rhyolite/smooth_brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:rhyolite_smooth_brick_furnace" - }, - "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" - } - ] + "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 ce6f03e77..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,19 +17,5 @@ "result": { "item": "mineralogy:rhyolite_smooth_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ] + } } 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 964a5f677..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,25 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:rhyolite_smooth_brick" + "tag": "mineralogy:stones/rhyolite/smooth_brick" } }, "result": { "item": "mineralogy:rhyolite_smooth_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ] + } } 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 33ead7a1d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,25 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:rhyolite_smooth_brick" + "tag": "mineralogy:stones/rhyolite/smooth_brick" } }, "result": { "item": "mineralogy:rhyolite_smooth_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ] + } } 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 16fdbe8fa..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:rhyolite_smooth_slab" + "tag": "mineralogy:slabs/rhyolite/smooth" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:rhyolite_smooth_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ] + "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 cb3dab03d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:rhyolite_smooth_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ] + } } 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 f69046aed..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:rhyolite_smooth" + "tag": "mineralogy:stones/rhyolite/smooth" } }, "result": { "item": "mineralogy:rhyolite_smooth_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ] + } } 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 ef26c3e00..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_smooth_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:rhyolite_smooth" + "tag": "mineralogy:stones/rhyolite/smooth" } }, "result": { "item": "mineralogy:rhyolite_smooth_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_stairs.json b/src/main/resources/data/mineralogy/recipes/rhyolite_stairs.json index d12609697..c2812d03a 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,17 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:rhyolite" + "tag": "mineralogy:stones/rhyolite" } }, "result": { "item": "mineralogy:rhyolite_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] + } } 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 501d842f2..000000000 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_stairs_from_rhyolite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:rhyolite" - }, - "result": "mineralogy:rhyolite_stairs", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/rhyolite_wall.json b/src/main/resources/data/mineralogy/recipes/rhyolite_wall.json index 411f67e4f..056bc8445 100644 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_wall.json +++ b/src/main/resources/data/mineralogy/recipes/rhyolite_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rhyolite_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:rhyolite" + "tag": "mineralogy:stones/rhyolite" } }, "result": { "item": "mineralogy:rhyolite_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] + } } 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 19eff3b61..000000000 --- a/src/main/resources/data/mineralogy/recipes/rhyolite_wall_from_rhyolite_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:rhyolite" - }, - "result": "mineralogy:rhyolite_wall", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/rock_salt.json b/src/main/resources/data/mineralogy/recipes/rock_salt.json index 8a9256634..b22dfdd8b 100644 --- a/src/main/resources/data/mineralogy/recipes/rock_salt.json +++ b/src/main/resources/data/mineralogy/recipes/rock_salt.json @@ -1,15 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xx", - "xx" - ], - "key": { - "x": { - "tag": "forge:dusts/rock_salt" - } - }, - "result": { - "item": "mineralogy:rock_salt" - } + "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 f474e278e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:rock_salt" + "tag": "mineralogy:stones/rock_salt" } }, "result": { "item": "mineralogy:rock_salt_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ] + } } 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 93212dd2c..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:rock_salt_brick_slab" + "tag": "mineralogy:slabs/rock_salt/brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:rock_salt_brick_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ] + "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 a71f17e75..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:rock_salt_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ] + } } 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 e442619b2..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:rock_salt_brick" + "tag": "mineralogy:stones/rock_salt/brick" } }, "result": { "item": "mineralogy:rock_salt_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ] + } } 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 a885acbb6..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:rock_salt_brick" + "tag": "mineralogy:stones/rock_salt/brick" } }, "result": { "item": "mineralogy:rock_salt_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ] + } } 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 91a0a30dc..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": [ { - "item": "mineralogy:rock_salt" + "tag": "mineralogy:stones/rock_salt" }, { - "item": "mineralogy: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 4448d16dd..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,12 +1,18 @@ { - "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 1d62529e6..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,23 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:rock_salt_slab" + "tag": "mineralogy:slabs/rock_salt" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:rock_salt_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] + "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 4a185b4ac..000000000 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_furnace_from_rock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:rock_salt" - } - }, - "result": { - "item": "mineralogy:rock_salt_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] -} 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 03d3f76df..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_axe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:rock_salt_relief_axe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 0393ee543..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_blank" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:rock_salt_relief_blank", "count": 16 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 af6a98a37..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_cross" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:rock_salt_relief_cross", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 f91c45177..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_hammer" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "zxz", @@ -19,15 +25,5 @@ "result": { "item": "mineralogy:rock_salt_relief_hammer", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 593431599..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_hoe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:rock_salt_relief_hoe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 c69c067d6..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_horizontal" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:rock_salt_relief_horizontal", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 a7a49f6b4..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_i" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:rock_salt_relief_i", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 e6d5967af..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_left" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:rock_salt_relief_left", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 8124e0d43..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_pickaxe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:rock_salt_relief_pickaxe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 a63820764..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_plus" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ " x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:rock_salt_relief_plus", "count": 5 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 8e534eee1..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,27 +1,21 @@ { - "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 - }, "conditions": [ { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:rock_salt_relief_left" }, { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" + "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 9868a9ede..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_sword" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:rock_salt_relief_sword", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 1823e4c64..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_relief_vertical" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:rock_salt_relief_vertical", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 0765c6afe..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,11 +17,5 @@ "result": { "item": "mineralogy:rock_salt_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] + } } 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 4fe22c7f0..000000000 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_slab_from_rock_salt_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:rock_salt" - }, - "result": "mineralogy:rock_salt_slab", - "count": 2, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] -} 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 559e3dcdf..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,20 +1,21 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:rock_salt" + "tag": "mineralogy:stones/rock_salt" }, { "item": "minecraft:sand" } ], "result": { - "item": "mineralogy:rock_salt_smooth" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ] + "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 c5de717a0..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:rock_salt_smooth" + "tag": "mineralogy:stones/rock_salt/smooth" } }, "result": { "item": "mineralogy:rock_salt_smooth_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ] + } } 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 eaed8a329..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,31 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:rock_salt_smooth_brick_slab" + "tag": "mineralogy:slabs/rock_salt/smooth_brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:rock_salt_smooth_brick_furnace" - }, - "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" - } - ] + "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 31c0b2910..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,19 +17,5 @@ "result": { "item": "mineralogy:rock_salt_smooth_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ] + } } 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 266369e0c..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,25 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:rock_salt_smooth_brick" + "tag": "mineralogy:stones/rock_salt/smooth_brick" } }, "result": { "item": "mineralogy:rock_salt_smooth_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ] + } } 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 7a07724b3..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,25 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:rock_salt_smooth_brick" + "tag": "mineralogy:stones/rock_salt/smooth_brick" } }, "result": { "item": "mineralogy:rock_salt_smooth_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ] + } } 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 96c4ac9c4..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:rock_salt_smooth_slab" + "tag": "mineralogy:slabs/rock_salt/smooth" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:rock_salt_smooth_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ] + "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 e12044efb..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:rock_salt_smooth_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ] + } } 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 a8abc563c..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:rock_salt_smooth" + "tag": "mineralogy:stones/rock_salt/smooth" } }, "result": { "item": "mineralogy:rock_salt_smooth_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ] + } } 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 6160330f2..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_smooth_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:rock_salt_smooth" + "tag": "mineralogy:stones/rock_salt/smooth" } }, "result": { "item": "mineralogy:rock_salt_smooth_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ] + } } 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 bf6eb3bf7..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,17 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:rock_salt" + "tag": "mineralogy:stones/rock_salt" } }, "result": { "item": "mineralogy:rock_salt_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] + } } 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 2523b8627..000000000 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_stairs_from_rock_salt_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:rock_salt" - }, - "result": "mineralogy:rock_salt_stairs", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] -} 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 8570e9f4d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:rock_salt_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:rock_salt" + "tag": "mineralogy:stones/rock_salt" } }, "result": { "item": "mineralogy:rock_salt_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] + } } 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 0c7bf9bc7..000000000 --- a/src/main/resources/data/mineralogy/recipes/rock_salt_wall_from_rock_salt_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:rock_salt" - }, - "result": "mineralogy:rock_salt_wall", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/rocksaltlamp.json b/src/main/resources/data/mineralogy/recipes/rocksaltlamp.json index 25dd9fe0f..ebec1319b 100644 --- a/src/main/resources/data/mineralogy/recipes/rocksaltlamp.json +++ b/src/main/resources/data/mineralogy/recipes/rocksaltlamp.json @@ -1,17 +1,28 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/rock_salt" - }, - { - "item": "minecraft:torch" - }, - { - "item": "minecraft:iron_ingot" - } - ], - "result": { - "item": "mineralogy:rocksaltlamp" - } + "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 e5dfae956..1d073aee8 100644 --- a/src/main/resources/data/mineralogy/recipes/rocksaltstreetlamp.json +++ b/src/main/resources/data/mineralogy/recipes/rocksaltstreetlamp.json @@ -1,19 +1,30 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "x", - "y", - "y" - ], - "key": { - "x": { - "tag": "forge:lamps/rock_salt" - }, - "y": { - "item": "minecraft:iron_ingot" - } - }, - "result": { - "item": "mineralogy:rocksaltstreetlamp" - } + "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 eef15a4ba..700f53842 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_brick.json +++ b/src/main/resources/data/mineralogy/recipes/schist_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:schist" + "tag": "mineralogy:stones/schist" } }, "result": { "item": "mineralogy:schist_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ] + } } 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 bddf9fc59..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:schist_brick_slab" + "tag": "mineralogy:slabs/schist/brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:schist_brick_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ] + "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 fa1ddfade..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:schist_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ] + } } 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 8336abfd2..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:schist_brick" + "tag": "mineralogy:stones/schist/brick" } }, "result": { "item": "mineralogy:schist_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ] + } } 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 a21382230..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:schist_brick" + "tag": "mineralogy:stones/schist/brick" } }, "result": { "item": "mineralogy:schist_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ] + } } 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 c48fd1ec7..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": [ { - "item": "mineralogy:schist" + "tag": "mineralogy:stones/schist" }, { - "item": "mineralogy: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 e86cc760b..e1e3acd01 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/schist_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,23 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:schist_slab" + "tag": "mineralogy:slabs/schist" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:schist_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] + "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 5f05b3887..000000000 --- a/src/main/resources/data/mineralogy/recipes/schist_furnace_from_rock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:schist" - } - }, - "result": { - "item": "mineralogy:schist_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] -} 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 fcc4b25db..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_axe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:schist_relief_axe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 1620945e4..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_blank" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:schist_relief_blank", "count": 16 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 9128271a7..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_cross" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:schist_relief_cross", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 39aaa7b17..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_hammer" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "zxz", @@ -19,15 +25,5 @@ "result": { "item": "mineralogy:schist_relief_hammer", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 2a7c3b7c1..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_hoe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:schist_relief_hoe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 7fda0f25d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_horizontal" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:schist_relief_horizontal", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 73a22818f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_i" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:schist_relief_i", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 bfbac5554..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_left" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:schist_relief_left", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 952715b1f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_pickaxe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:schist_relief_pickaxe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 46c0e93c6..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_plus" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ " x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:schist_relief_plus", "count": 5 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 1d398207e..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,27 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:schist_relief_left" - } - }, - "result": { - "item": "mineralogy:schist_relief_right", - "count": 3 - }, "conditions": [ { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:schist_relief_left" }, { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" + "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 a916e1fa3..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_sword" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:schist_relief_sword", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 aaf30d557..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_relief_vertical" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:schist_relief_vertical", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_slab.json b/src/main/resources/data/mineralogy/recipes/schist_slab.json index c6b181156..4e3cb02b7 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_slab.json +++ b/src/main/resources/data/mineralogy/recipes/schist_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,11 +17,5 @@ "result": { "item": "mineralogy:schist_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] + } } 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 4e60f36ee..000000000 --- a/src/main/resources/data/mineralogy/recipes/schist_slab_from_schist_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:schist" - }, - "result": "mineralogy:schist_slab", - "count": 2, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/schist_smooth.json b/src/main/resources/data/mineralogy/recipes/schist_smooth.json index 014a96878..eb54c8a5b 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/schist_smooth.json @@ -1,20 +1,21 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:schist" + "tag": "mineralogy:stones/schist" }, { "item": "minecraft:sand" } ], "result": { - "item": "mineralogy:schist_smooth" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ] + "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 cb7ed4683..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:schist_smooth" + "tag": "mineralogy:stones/schist/smooth" } }, "result": { "item": "mineralogy:schist_smooth_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ] + } } 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 130216e57..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,31 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:schist_smooth_brick_slab" + "tag": "mineralogy:slabs/schist/smooth_brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:schist_smooth_brick_furnace" - }, - "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" - } - ] + "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 8777edb36..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,19 +17,5 @@ "result": { "item": "mineralogy:schist_smooth_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ] + } } 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 c72c3e99d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,25 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:schist_smooth_brick" + "tag": "mineralogy:stones/schist/smooth_brick" } }, "result": { "item": "mineralogy:schist_smooth_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ] + } } 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 ee11e6be9..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,25 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:schist_smooth_brick" + "tag": "mineralogy:stones/schist/smooth_brick" } }, "result": { "item": "mineralogy:schist_smooth_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ] + } } 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 f4a1f188f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:schist_smooth_slab" + "tag": "mineralogy:slabs/schist/smooth" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:schist_smooth_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ] + "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 d5b35d4f8..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:schist_smooth_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ] + } } 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 96ba8aac2..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:schist_smooth" + "tag": "mineralogy:stones/schist/smooth" } }, "result": { "item": "mineralogy:schist_smooth_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ] + } } 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 6f521f9f7..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_smooth_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:schist_smooth" + "tag": "mineralogy:stones/schist/smooth" } }, "result": { "item": "mineralogy:schist_smooth_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/schist_stairs.json b/src/main/resources/data/mineralogy/recipes/schist_stairs.json index 8aab2a2f7..e2bc4bba0 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/schist_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,17 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:schist" + "tag": "mineralogy:stones/schist" } }, "result": { "item": "mineralogy:schist_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] + } } 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 19a99f03b..000000000 --- a/src/main/resources/data/mineralogy/recipes/schist_stairs_from_schist_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:schist" - }, - "result": "mineralogy:schist_stairs", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/schist_wall.json b/src/main/resources/data/mineralogy/recipes/schist_wall.json index 5b376edb5..3868aa58f 100644 --- a/src/main/resources/data/mineralogy/recipes/schist_wall.json +++ b/src/main/resources/data/mineralogy/recipes/schist_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:schist_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:schist" + "tag": "mineralogy:stones/schist" } }, "result": { "item": "mineralogy:schist_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] + } } 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 d212b23e8..000000000 --- a/src/main/resources/data/mineralogy/recipes/schist_wall_from_schist_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:schist" - }, - "result": "mineralogy:schist_wall", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/scoria_brick.json b/src/main/resources/data/mineralogy/recipes/scoria_brick.json index 57c26ac15..dcc2e1126 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_brick.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:scoria" + "tag": "mineralogy:stones/scoria" } }, "result": { "item": "mineralogy:scoria_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ] + } } 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 a77413dbe..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:scoria_brick_slab" + "tag": "mineralogy:slabs/scoria/brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:scoria_brick_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ] + "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 2488bb33b..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:scoria_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ] + } } 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 369c6f8f6..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:scoria_brick" + "tag": "mineralogy:stones/scoria/brick" } }, "result": { "item": "mineralogy:scoria_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ] + } } 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 acbfa41e6..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:scoria_brick" + "tag": "mineralogy:stones/scoria/brick" } }, "result": { "item": "mineralogy:scoria_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ] + } } 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 473dc2c86..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": [ { - "item": "mineralogy:scoria" + "tag": "mineralogy:stones/scoria" }, { - "item": "mineralogy: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 861d670b4..532b67e4a 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,23 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:scoria_slab" + "tag": "mineralogy:slabs/scoria" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:scoria_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] + "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 64f97caa1..000000000 --- a/src/main/resources/data/mineralogy/recipes/scoria_furnace_from_rock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:scoria" - } - }, - "result": { - "item": "mineralogy:scoria_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] -} 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 eef8f11a5..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_axe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:scoria_relief_axe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 0dfe8b9fa..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_blank" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:scoria_relief_blank", "count": 16 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 5d481b12e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_cross" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:scoria_relief_cross", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 98b5cad55..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_hammer" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "zxz", @@ -19,15 +25,5 @@ "result": { "item": "mineralogy:scoria_relief_hammer", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 1254a94a7..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_hoe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:scoria_relief_hoe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 0c7e34758..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_horizontal" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:scoria_relief_horizontal", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 d2d33f7ad..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_i" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:scoria_relief_i", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 070687e29..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_left" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:scoria_relief_left", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 a9c540428..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_pickaxe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:scoria_relief_pickaxe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 aaae2adbe..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_plus" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ " x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:scoria_relief_plus", "count": 5 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 1434e993c..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,27 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:scoria_relief_left" - } - }, - "result": { - "item": "mineralogy:scoria_relief_right", - "count": 3 - }, "conditions": [ { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:scoria_relief_left" }, { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" + "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 c1cd16b97..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_sword" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:scoria_relief_sword", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 ac29e3bbe..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_relief_vertical" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:scoria_relief_vertical", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_slab.json b/src/main/resources/data/mineralogy/recipes/scoria_slab.json index b0a5fc0ea..82b2b4dba 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_slab.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,11 +17,5 @@ "result": { "item": "mineralogy:scoria_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] + } } 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 d995e239a..000000000 --- a/src/main/resources/data/mineralogy/recipes/scoria_slab_from_scoria_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:scoria" - }, - "result": "mineralogy:scoria_slab", - "count": 2, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/scoria_smooth.json b/src/main/resources/data/mineralogy/recipes/scoria_smooth.json index ce3cb523a..8d5552c99 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_smooth.json @@ -1,20 +1,21 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:scoria" + "tag": "mineralogy:stones/scoria" }, { "item": "minecraft:sand" } ], "result": { - "item": "mineralogy:scoria_smooth" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ] + "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 88a14ecef..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:scoria_smooth" + "tag": "mineralogy:stones/scoria/smooth" } }, "result": { "item": "mineralogy:scoria_smooth_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ] + } } 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 defae79b3..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,31 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:scoria_smooth_brick_slab" + "tag": "mineralogy:slabs/scoria/smooth_brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:scoria_smooth_brick_furnace" - }, - "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" - } - ] + "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 de1eed4ce..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,19 +17,5 @@ "result": { "item": "mineralogy:scoria_smooth_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ] + } } 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 456500a76..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,25 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:scoria_smooth_brick" + "tag": "mineralogy:stones/scoria/smooth_brick" } }, "result": { "item": "mineralogy:scoria_smooth_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ] + } } 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 8329e29f3..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,25 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:scoria_smooth_brick" + "tag": "mineralogy:stones/scoria/smooth_brick" } }, "result": { "item": "mineralogy:scoria_smooth_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ] + } } 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 0d351fef5..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:scoria_smooth_slab" + "tag": "mineralogy:slabs/scoria/smooth" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:scoria_smooth_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ] + "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 8fa5e6032..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:scoria_smooth_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ] + } } 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 a45161154..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:scoria_smooth" + "tag": "mineralogy:stones/scoria/smooth" } }, "result": { "item": "mineralogy:scoria_smooth_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ] + } } 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 dc69c535d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_smooth_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:scoria_smooth" + "tag": "mineralogy:stones/scoria/smooth" } }, "result": { "item": "mineralogy:scoria_smooth_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/scoria_stairs.json b/src/main/resources/data/mineralogy/recipes/scoria_stairs.json index f8c1236ad..31706616d 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,17 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:scoria" + "tag": "mineralogy:stones/scoria" } }, "result": { "item": "mineralogy:scoria_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] + } } 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 8c68b0e7c..000000000 --- a/src/main/resources/data/mineralogy/recipes/scoria_stairs_from_scoria_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:scoria" - }, - "result": "mineralogy:scoria_stairs", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/scoria_wall.json b/src/main/resources/data/mineralogy/recipes/scoria_wall.json index 59188a1d7..8a2aeeed6 100644 --- a/src/main/resources/data/mineralogy/recipes/scoria_wall.json +++ b/src/main/resources/data/mineralogy/recipes/scoria_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:scoria_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:scoria" + "tag": "mineralogy:stones/scoria" } }, "result": { "item": "mineralogy:scoria_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] + } } 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 ab1ecdced..000000000 --- a/src/main/resources/data/mineralogy/recipes/scoria_wall_from_scoria_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:scoria" - }, - "result": "mineralogy:scoria_wall", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/shale_brick.json b/src/main/resources/data/mineralogy/recipes/shale_brick.json index ad4d52379..c3827e606 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_brick.json +++ b/src/main/resources/data/mineralogy/recipes/shale_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:shale" + "tag": "mineralogy:stones/shale" } }, "result": { "item": "mineralogy:shale_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ] + } } 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 b1717122a..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:shale_brick_slab" + "tag": "mineralogy:slabs/shale/brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:shale_brick_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ] + "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 c99e55c02..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:shale_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ] + } } 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 48fe1ed87..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:shale_brick" + "tag": "mineralogy:stones/shale/brick" } }, "result": { "item": "mineralogy:shale_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ] + } } 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 ed8689719..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:shale_brick" + "tag": "mineralogy:stones/shale/brick" } }, "result": { "item": "mineralogy:shale_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ] + } } 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 7ec170203..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": [ { - "item": "mineralogy:shale" + "tag": "mineralogy:stones/shale" }, { - "item": "mineralogy: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 e35736512..08ace2a38 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/shale_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,23 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:shale_slab" + "tag": "mineralogy:slabs/shale" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:shale_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] + "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 def4e8bfc..000000000 --- a/src/main/resources/data/mineralogy/recipes/shale_furnace_from_rock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:shale" - } - }, - "result": { - "item": "mineralogy:shale_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] -} 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 d1bb15da8..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_axe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:shale_relief_axe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 ab146040e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_blank" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:shale_relief_blank", "count": 16 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 b906264d1..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_cross" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:shale_relief_cross", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 1a4754545..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_hammer" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "zxz", @@ -19,15 +25,5 @@ "result": { "item": "mineralogy:shale_relief_hammer", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 987fdebde..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_hoe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:shale_relief_hoe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 402b3e2bf..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_horizontal" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:shale_relief_horizontal", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 dd020816c..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_i" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:shale_relief_i", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 24a5a654f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_left" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:shale_relief_left", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 49b68f32a..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_pickaxe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:shale_relief_pickaxe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 31b1e7fc7..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_plus" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ " x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:shale_relief_plus", "count": 5 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 fea0d60ad..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,27 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:shale_relief_left" - } - }, - "result": { - "item": "mineralogy:shale_relief_right", - "count": 3 - }, "conditions": [ { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:shale_relief_left" }, { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" + "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 3241cb2ec..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_sword" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:shale_relief_sword", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 c47811a07..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_relief_vertical" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:shale_relief_vertical", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_slab.json b/src/main/resources/data/mineralogy/recipes/shale_slab.json index 6f15ef174..ec69791cd 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_slab.json +++ b/src/main/resources/data/mineralogy/recipes/shale_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,11 +17,5 @@ "result": { "item": "mineralogy:shale_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] + } } 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 f5b21ff85..000000000 --- a/src/main/resources/data/mineralogy/recipes/shale_slab_from_shale_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:shale" - }, - "result": "mineralogy:shale_slab", - "count": 2, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/shale_smooth.json b/src/main/resources/data/mineralogy/recipes/shale_smooth.json index 2dd4b946d..1b2cb9458 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/shale_smooth.json @@ -1,20 +1,21 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:shale" + "tag": "mineralogy:stones/shale" }, { "item": "minecraft:sand" } ], "result": { - "item": "mineralogy:shale_smooth" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ] + "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 77d5fe0c8..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:shale_smooth" + "tag": "mineralogy:stones/shale/smooth" } }, "result": { "item": "mineralogy:shale_smooth_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ] + } } 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 f9c1af5c1..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,31 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:shale_smooth_brick_slab" + "tag": "mineralogy:slabs/shale/smooth_brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:shale_smooth_brick_furnace" - }, - "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" - } - ] + "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 bf1e5b335..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,19 +17,5 @@ "result": { "item": "mineralogy:shale_smooth_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ] + } } 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 9fe6d0e91..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,25 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:shale_smooth_brick" + "tag": "mineralogy:stones/shale/smooth_brick" } }, "result": { "item": "mineralogy:shale_smooth_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ] + } } 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 63b92d301..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,25 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:shale_smooth_brick" + "tag": "mineralogy:stones/shale/smooth_brick" } }, "result": { "item": "mineralogy:shale_smooth_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ] + } } 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 47233de55..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:shale_smooth_slab" + "tag": "mineralogy:slabs/shale/smooth" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:shale_smooth_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ] + "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 60bce8d85..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:shale_smooth_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ] + } } 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 e07b06ba2..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:shale_smooth" + "tag": "mineralogy:stones/shale/smooth" } }, "result": { "item": "mineralogy:shale_smooth_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ] + } } 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 cd2c31a4b..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_smooth_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:shale_smooth" + "tag": "mineralogy:stones/shale/smooth" } }, "result": { "item": "mineralogy:shale_smooth_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/shale_stairs.json b/src/main/resources/data/mineralogy/recipes/shale_stairs.json index 5650298d4..8d563ac92 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/shale_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,17 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:shale" + "tag": "mineralogy:stones/shale" } }, "result": { "item": "mineralogy:shale_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] + } } 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 b7af2b334..000000000 --- a/src/main/resources/data/mineralogy/recipes/shale_stairs_from_shale_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:shale" - }, - "result": "mineralogy:shale_stairs", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/shale_wall.json b/src/main/resources/data/mineralogy/recipes/shale_wall.json index 2fea26955..9d30f2b36 100644 --- a/src/main/resources/data/mineralogy/recipes/shale_wall.json +++ b/src/main/resources/data/mineralogy/recipes/shale_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:shale_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:shale" + "tag": "mineralogy:stones/shale" } }, "result": { "item": "mineralogy:shale_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] + } } 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 6f9541a5e..000000000 --- a/src/main/resources/data/mineralogy/recipes/shale_wall_from_shale_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:shale" - }, - "result": "mineralogy:shale_wall", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_brick.json b/src/main/resources/data/mineralogy/recipes/siltstone_brick.json index ba98d9237..070930015 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_brick.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:siltstone" + "tag": "mineralogy:stones/siltstone" } }, "result": { "item": "mineralogy:siltstone_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ] + } } 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 ed144b27f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:siltstone_brick_slab" + "tag": "mineralogy:slabs/siltstone/brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:siltstone_brick_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ] + "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 1a76df3d1..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:siltstone_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ] + } } 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 a1dafd92c..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:siltstone_brick" + "tag": "mineralogy:stones/siltstone/brick" } }, "result": { "item": "mineralogy:siltstone_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ] + } } 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 50146432d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:siltstone_brick" + "tag": "mineralogy:stones/siltstone/brick" } }, "result": { "item": "mineralogy:siltstone_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ] + } } 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 f6ec29dd0..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": [ { - "item": "mineralogy:siltstone" + "tag": "mineralogy:stones/siltstone" }, { - "item": "mineralogy: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 a06ecf1f7..6e10043c0 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,23 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:siltstone_slab" + "tag": "mineralogy:slabs/siltstone" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:siltstone_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] + "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 edfa97926..000000000 --- a/src/main/resources/data/mineralogy/recipes/siltstone_furnace_from_rock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:siltstone" - } - }, - "result": { - "item": "mineralogy:siltstone_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] -} 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 79be83334..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_axe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:siltstone_relief_axe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 27bb328c0..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_blank" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:siltstone_relief_blank", "count": 16 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 8de744bbe..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_cross" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:siltstone_relief_cross", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 6e8f87562..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_hammer" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "zxz", @@ -19,15 +25,5 @@ "result": { "item": "mineralogy:siltstone_relief_hammer", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 f16f5f972..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_hoe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:siltstone_relief_hoe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 dfabbdedc..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_horizontal" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:siltstone_relief_horizontal", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 cb580656d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_i" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:siltstone_relief_i", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 a3eda0537..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_left" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:siltstone_relief_left", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 75879508b..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_pickaxe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:siltstone_relief_pickaxe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 714436c2b..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_plus" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ " x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:siltstone_relief_plus", "count": 5 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 7237b9cd6..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,27 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:siltstone_relief_left" - } - }, - "result": { - "item": "mineralogy:siltstone_relief_right", - "count": 3 - }, "conditions": [ { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:siltstone_relief_left" }, { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" + "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 5fca3ff3e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_sword" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:siltstone_relief_sword", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 3e97b33a0..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_relief_vertical" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:siltstone_relief_vertical", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_slab.json b/src/main/resources/data/mineralogy/recipes/siltstone_slab.json index ad62289c2..b55a273d9 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_slab.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,11 +17,5 @@ "result": { "item": "mineralogy:siltstone_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] + } } 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 71b6d6ffe..000000000 --- a/src/main/resources/data/mineralogy/recipes/siltstone_slab_from_siltstone_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:siltstone" - }, - "result": "mineralogy:siltstone_slab", - "count": 2, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_smooth.json b/src/main/resources/data/mineralogy/recipes/siltstone_smooth.json index 379dc9c9f..80313189b 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_smooth.json @@ -1,20 +1,21 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:siltstone" + "tag": "mineralogy:stones/siltstone" }, { "item": "minecraft:sand" } ], "result": { - "item": "mineralogy:siltstone_smooth" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ] + "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 08d05fa4f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:siltstone_smooth" + "tag": "mineralogy:stones/siltstone/smooth" } }, "result": { "item": "mineralogy:siltstone_smooth_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ] + } } 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 7aa3433d6..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,31 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:siltstone_smooth_brick_slab" + "tag": "mineralogy:slabs/siltstone/smooth_brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:siltstone_smooth_brick_furnace" - }, - "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" - } - ] + "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 f30b58697..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,19 +17,5 @@ "result": { "item": "mineralogy:siltstone_smooth_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ] + } } 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 296add1f1..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,25 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:siltstone_smooth_brick" + "tag": "mineralogy:stones/siltstone/smooth_brick" } }, "result": { "item": "mineralogy:siltstone_smooth_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ] + } } 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 3e05abd76..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,25 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:siltstone_smooth_brick" + "tag": "mineralogy:stones/siltstone/smooth_brick" } }, "result": { "item": "mineralogy:siltstone_smooth_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ] + } } 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 16f11ed74..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:siltstone_smooth_slab" + "tag": "mineralogy:slabs/siltstone/smooth" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:siltstone_smooth_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ] + "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 990638f0b..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:siltstone_smooth_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ] + } } 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 9cf687c3a..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:siltstone_smooth" + "tag": "mineralogy:stones/siltstone/smooth" } }, "result": { "item": "mineralogy:siltstone_smooth_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ] + } } 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 6d89e3678..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_smooth_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:siltstone_smooth" + "tag": "mineralogy:stones/siltstone/smooth" } }, "result": { "item": "mineralogy:siltstone_smooth_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_stairs.json b/src/main/resources/data/mineralogy/recipes/siltstone_stairs.json index 6ce5eefe6..7b4f31444 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,17 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:siltstone" + "tag": "mineralogy:stones/siltstone" } }, "result": { "item": "mineralogy:siltstone_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] + } } 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 5674f4355..000000000 --- a/src/main/resources/data/mineralogy/recipes/siltstone_stairs_from_siltstone_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:siltstone" - }, - "result": "mineralogy:siltstone_stairs", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/siltstone_wall.json b/src/main/resources/data/mineralogy/recipes/siltstone_wall.json index ab8867e51..6e325d060 100644 --- a/src/main/resources/data/mineralogy/recipes/siltstone_wall.json +++ b/src/main/resources/data/mineralogy/recipes/siltstone_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:siltstone_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:siltstone" + "tag": "mineralogy:stones/siltstone" } }, "result": { "item": "mineralogy:siltstone_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] + } } 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 60f26f778..000000000 --- a/src/main/resources/data/mineralogy/recipes/siltstone_wall_from_siltstone_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:siltstone" - }, - "result": "mineralogy:siltstone_wall", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/slate_brick.json b/src/main/resources/data/mineralogy/recipes/slate_brick.json index 5ef0b9e20..9cc3c1329 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_brick.json +++ b/src/main/resources/data/mineralogy/recipes/slate_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:slate" + "tag": "mineralogy:stones/slate" } }, "result": { "item": "mineralogy:slate_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ] + } } 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 7c2b40d83..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:slate_brick_slab" + "tag": "mineralogy:slabs/slate/brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:slate_brick_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ] + "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 ef3833973..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:slate_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ] + } } 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 a69209da9..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:slate_brick" + "tag": "mineralogy:stones/slate/brick" } }, "result": { "item": "mineralogy:slate_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ] + } } 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 857d996a6..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:slate_brick" + "tag": "mineralogy:stones/slate/brick" } }, "result": { "item": "mineralogy:slate_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ] + } } 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 f90e3d210..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": [ { - "item": "mineralogy:slate" + "tag": "mineralogy:stones/slate" }, { - "item": "mineralogy: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 2697e4974..b0dd5af7d 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/slate_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,23 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:slate_slab" + "tag": "mineralogy:slabs/slate" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:slate_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] + "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 6d001da41..000000000 --- a/src/main/resources/data/mineralogy/recipes/slate_furnace_from_rock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:slate" - } - }, - "result": { - "item": "mineralogy:slate_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] -} 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 39f3305af..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_axe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:slate_relief_axe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 3db0dfd6f..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_blank" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:slate_relief_blank", "count": 16 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 e11aac4b6..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_cross" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:slate_relief_cross", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 df061b995..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_hammer" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "zxz", @@ -19,15 +25,5 @@ "result": { "item": "mineralogy:slate_relief_hammer", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 a4f11ae59..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_hoe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:slate_relief_hoe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 112328141..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_horizontal" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:slate_relief_horizontal", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 d1fd78497..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_i" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:slate_relief_i", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 b3431c9fb..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_left" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:slate_relief_left", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 be25ca0f5..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_pickaxe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:slate_relief_pickaxe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 af54da69a..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_plus" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ " x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:slate_relief_plus", "count": 5 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 eb1f49b1a..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,27 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:slate_relief_left" - } - }, - "result": { - "item": "mineralogy:slate_relief_right", - "count": 3 - }, "conditions": [ { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:slate_relief_left" }, { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" + "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 fb864fe10..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_sword" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:slate_relief_sword", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 cfe911c7b..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_relief_vertical" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:slate_relief_vertical", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_slab.json b/src/main/resources/data/mineralogy/recipes/slate_slab.json index 46417a40c..b5872fa86 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_slab.json +++ b/src/main/resources/data/mineralogy/recipes/slate_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,11 +17,5 @@ "result": { "item": "mineralogy:slate_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] + } } 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 d38078939..000000000 --- a/src/main/resources/data/mineralogy/recipes/slate_slab_from_slate_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:slate" - }, - "result": "mineralogy:slate_slab", - "count": 2, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/slate_smooth.json b/src/main/resources/data/mineralogy/recipes/slate_smooth.json index c7b54d22a..7349a2a1f 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/slate_smooth.json @@ -1,20 +1,21 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:slate" + "tag": "mineralogy:stones/slate" }, { "item": "minecraft:sand" } ], "result": { - "item": "mineralogy:slate_smooth" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ] + "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 22e6e52e6..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:slate_smooth" + "tag": "mineralogy:stones/slate/smooth" } }, "result": { "item": "mineralogy:slate_smooth_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ] + } } 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 2f3c476e6..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,31 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:slate_smooth_brick_slab" + "tag": "mineralogy:slabs/slate/smooth_brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:slate_smooth_brick_furnace" - }, - "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" - } - ] + "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 d7603827e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,19 +17,5 @@ "result": { "item": "mineralogy:slate_smooth_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ] + } } 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 0fdb2b985..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,25 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:slate_smooth_brick" + "tag": "mineralogy:stones/slate/smooth_brick" } }, "result": { "item": "mineralogy:slate_smooth_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ] + } } 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 5a09293d0..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,25 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:slate_smooth_brick" + "tag": "mineralogy:stones/slate/smooth_brick" } }, "result": { "item": "mineralogy:slate_smooth_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ] + } } 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 c49d5ef20..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:slate_smooth_slab" + "tag": "mineralogy:slabs/slate/smooth" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:slate_smooth_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ] + "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 4121a1a57..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:slate_smooth_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ] + } } 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 6c2f3626e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:slate_smooth" + "tag": "mineralogy:stones/slate/smooth" } }, "result": { "item": "mineralogy:slate_smooth_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ] + } } 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 330ebc745..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_smooth_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:slate_smooth" + "tag": "mineralogy:stones/slate/smooth" } }, "result": { "item": "mineralogy:slate_smooth_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/slate_stairs.json b/src/main/resources/data/mineralogy/recipes/slate_stairs.json index f02bd9fb2..54f07a20f 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/slate_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,17 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:slate" + "tag": "mineralogy:stones/slate" } }, "result": { "item": "mineralogy:slate_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] + } } 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 064f7e0b4..000000000 --- a/src/main/resources/data/mineralogy/recipes/slate_stairs_from_slate_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:slate" - }, - "result": "mineralogy:slate_stairs", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/slate_wall.json b/src/main/resources/data/mineralogy/recipes/slate_wall.json index e512bbd58..fa2c674d1 100644 --- a/src/main/resources/data/mineralogy/recipes/slate_wall.json +++ b/src/main/resources/data/mineralogy/recipes/slate_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:slate_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:slate" + "tag": "mineralogy:stones/slate" } }, "result": { "item": "mineralogy:slate_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] + } } 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 655e9eeaa..000000000 --- a/src/main/resources/data/mineralogy/recipes/slate_wall_from_slate_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:slate" - }, - "result": "mineralogy:slate_wall", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/sulfur_block.json b/src/main/resources/data/mineralogy/recipes/sulfur_block.json index fa91af97e..d3be94c09 100644 --- a/src/main/resources/data/mineralogy/recipes/sulfur_block.json +++ b/src/main/resources/data/mineralogy/recipes/sulfur_block.json @@ -1,16 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "xxx", - "xxx" - ], - "key": { - "x": { - "tag": "forge:dusts/sulfur" - } - }, - "result": { - "item": "mineralogy:sulfur_block" - } + "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 4a81c177f..8c5e0aef4 100644 --- a/src/main/resources/data/mineralogy/recipes/sulfur_dust.json +++ b/src/main/resources/data/mineralogy/recipes/sulfur_dust.json @@ -1,12 +1,22 @@ { - "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 ebf10e82e..c01221a43 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_brick.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_brick.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:tuff" + "tag": "mineralogy:stones/tuff" } }, "result": { "item": "mineralogy:tuff_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - } - ] + } } 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 c4670b6f2..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:tuff_brick_slab" + "tag": "mineralogy:slabs/tuff/brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:tuff_brick_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKFURNACE" - } - ] + "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 bde732589..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:tuff_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSLAB" - } - ] + } } 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 30e4d6c6a..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:tuff_brick" + "tag": "mineralogy:stones/tuff/brick" } }, "result": { "item": "mineralogy:tuff_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKSTAIRS" - } - ] + } } 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 22ad824cc..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:tuff_brick" + "tag": "mineralogy:stones/tuff/brick" } }, "result": { "item": "mineralogy:tuff_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_BRICKWALL" - } - ] + } } 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 0583dc310..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": [ { - "item": "mineralogy:tuff" + "tag": "mineralogy:stones/tuff" }, { - "item": "mineralogy: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 f40ff50c5..f4a3ebdcb 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_furnace.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_furnace.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,23 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:tuff_slab" + "tag": "mineralogy:slabs/tuff" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:tuff_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] + "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 ca682108d..000000000 --- a/src/main/resources/data/mineralogy/recipes/tuff_furnace_from_rock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "xxx", - "x x", - "xxx" - ], - "key": { - "x": { - "item": "mineralogy:tuff" - } - }, - "result": { - "item": "mineralogy:tuff_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKFURNACE" - } - ] -} 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 507066d20..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_axe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:tuff_relief_axe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 0d6518914..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_blank" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:tuff_relief_blank", "count": 16 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 bd01a7dd1..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_cross" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:tuff_relief_cross", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 b38476e31..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_hammer" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "zxz", @@ -19,15 +25,5 @@ "result": { "item": "mineralogy:tuff_relief_hammer", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 939c36a82..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_hoe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:tuff_relief_hoe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 be9ed41d7..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_horizontal" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:tuff_relief_horizontal", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 11183d0ab..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_i" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:tuff_relief_i", "count": 7 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 1b7721bf1..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_left" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:tuff_relief_left", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 07efccf0e..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_pickaxe" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:tuff_relief_pickaxe", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 1079f768a..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_plus" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ " x ", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:tuff_relief_plus", "count": 5 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 93825171d..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,27 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " x", - " x ", - "x " - ], - "key": { - "x": { - "item": "mineralogy:tuff_relief_left" - } - }, - "result": { - "item": "mineralogy:tuff_relief_right", - "count": 3 - }, "conditions": [ { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_right" + } + ], + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "mineralogy:tuff_relief_left" }, { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" + "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 781b1aed4..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_sword" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { @@ -32,15 +38,5 @@ "result": { "item": "mineralogy:tuff_relief_sword", "count": 8 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } 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 b0f467595..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_relief_vertical" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x", @@ -13,15 +19,5 @@ "result": { "item": "mineralogy:tuff_relief_vertical", "count": 3 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_RELIEFS" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_slab.json b/src/main/resources/data/mineralogy/recipes/tuff_slab.json index 5e2a06277..0401d5a55 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_slab.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_slab.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,11 +17,5 @@ "result": { "item": "mineralogy:tuff_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] + } } 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 34470f05d..000000000 --- a/src/main/resources/data/mineralogy/recipes/tuff_slab_from_tuff_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:tuff" - }, - "result": "mineralogy:tuff_slab", - "count": 2, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSLAB" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/tuff_smooth.json b/src/main/resources/data/mineralogy/recipes/tuff_smooth.json index 3ba56da6f..eee5b5cd1 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_smooth.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_smooth.json @@ -1,20 +1,21 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth" + } + ], "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "mineralogy:tuff" + "tag": "mineralogy:stones/tuff" }, { "item": "minecraft:sand" } ], "result": { - "item": "mineralogy:tuff_smooth" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - } - ] + "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 cad312555..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:tuff_smooth" + "tag": "mineralogy:stones/tuff/smooth" } }, "result": { "item": "mineralogy:tuff_smooth_brick", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - } - ] + } } 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 ce8a26d29..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,31 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:tuff_smooth_brick_slab" + "tag": "mineralogy:slabs/tuff/smooth_brick" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:tuff_smooth_brick_furnace" - }, - "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" - } - ] + "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 6f143cb1d..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,19 +17,5 @@ "result": { "item": "mineralogy:tuff_smooth_brick_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSLAB" - } - ] + } } 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 d38792389..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,25 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:tuff_smooth_brick" + "tag": "mineralogy:stones/tuff/smooth_brick" } }, "result": { "item": "mineralogy:tuff_smooth_brick_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKSTAIRS" - } - ] + } } 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 f9b53a2c3..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_brick_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,25 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:tuff_smooth_brick" + "tag": "mineralogy:stones/tuff/smooth_brick" } }, "result": { "item": "mineralogy:tuff_smooth_brick_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICK" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHBRICKWALL" - } - ] + } } 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 b6c1faeac..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_furnace" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -7,27 +13,14 @@ ], "key": { "x": { - "item": "mineralogy:tuff_smooth_slab" + "tag": "mineralogy:slabs/tuff/smooth" }, "y": { "item": "minecraft:furnace" } }, "result": { - "item": "mineralogy:tuff_smooth_furnace" - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHFURNACE" - } - ] + "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 c0f2a36ff..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_slab" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx" @@ -11,15 +17,5 @@ "result": { "item": "mineralogy:tuff_smooth_slab", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSLAB" - } - ] + } } 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 3541c1319..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,21 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:tuff_smooth" + "tag": "mineralogy:stones/tuff/smooth" } }, "result": { "item": "mineralogy:tuff_smooth_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHSTAIRS" - } - ] + } } 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 ceeaaa6b3..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,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_smooth_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,21 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:tuff_smooth" + "tag": "mineralogy:stones/tuff/smooth" } }, "result": { "item": "mineralogy:tuff_smooth_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTH" - }, - { - "type": "mineralogy:config", - "flag": "GENERATE_SMOOTHWALL" - } - ] + } } diff --git a/src/main/resources/data/mineralogy/recipes/tuff_stairs.json b/src/main/resources/data/mineralogy/recipes/tuff_stairs.json index 0b4287119..b922d6ede 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_stairs.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_stairs.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_stairs" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "x ", @@ -7,17 +13,11 @@ ], "key": { "x": { - "item": "mineralogy:tuff" + "tag": "mineralogy:stones/tuff" } }, "result": { "item": "mineralogy:tuff_stairs", "count": 4 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] + } } 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 fb6aafb76..000000000 --- a/src/main/resources/data/mineralogy/recipes/tuff_stairs_from_tuff_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:tuff" - }, - "result": "mineralogy:tuff_stairs", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKSTAIRS" - } - ] -} diff --git a/src/main/resources/data/mineralogy/recipes/tuff_wall.json b/src/main/resources/data/mineralogy/recipes/tuff_wall.json index 6c4c9dea1..8182a9816 100644 --- a/src/main/resources/data/mineralogy/recipes/tuff_wall.json +++ b/src/main/resources/data/mineralogy/recipes/tuff_wall.json @@ -1,4 +1,10 @@ { + "conditions": [ + { + "type": "forge:item_exists", + "item": "mineralogy:tuff_wall" + } + ], "type": "minecraft:crafting_shaped", "pattern": [ "xxx", @@ -6,17 +12,11 @@ ], "key": { "x": { - "item": "mineralogy:tuff" + "tag": "mineralogy:stones/tuff" } }, "result": { "item": "mineralogy:tuff_wall", "count": 6 - }, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] + } } 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 a7c57c425..000000000 --- a/src/main/resources/data/mineralogy/recipes/tuff_wall_from_tuff_stonecutting.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "ingredient": { - "item": "mineralogy:tuff" - }, - "result": "mineralogy:tuff_wall", - "count": 1, - "conditions": [ - { - "type": "mineralogy:config", - "flag": "GENERATE_ROCKWALL" - } - ] -} 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 3afce2862..000000000 --- a/src/main/resources/data/mineralogy/tags/items/vanilla_furnace_materials.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:cobblestone", - "minecraft:blackstone" - ] -} 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 2a765b58496f6a65ff50e194a56ba73d1b26a400 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Thu, 27 Aug 2026 12:42:20 +0100 Subject: [PATCH 2/8] 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 71e523488b877a05edd24a04e05853fa721a4247 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Thu, 27 Aug 2026 13:16:55 +0100 Subject: [PATCH 3/8] 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 4037c8d73d45eb8d9806f9820223725426d1b6b9 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Thu, 27 Aug 2026 14:29:34 +0100 Subject: [PATCH 4/8] 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 e27b88f4e96f27f96cd40259539eb274bd63dce5 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Thu, 27 Aug 2026 15:23:52 +0100 Subject: [PATCH 5/8] 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 | 2 +- .../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 | 2 +- .../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 | 2 +- .../recipes/amphibolite_wall.json | 2 +- .../advancements/recipes/andesite_brick.json | 2 +- .../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 | 2 +- .../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 | 2 +- .../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 | 2 +- .../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 | 2 +- .../recipes/basaltic_glass_wall.json | 2 +- .../recipes/conglomerate_brick.json | 2 +- .../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 | 2 +- .../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 | 2 +- .../recipes/conglomerate_wall.json | 2 +- .../advancements/recipes/diabase_brick.json | 2 +- .../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 | 2 +- .../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 | 2 +- .../advancements/recipes/diabase_wall.json | 2 +- .../advancements/recipes/diorite_brick.json | 2 +- .../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 | 2 +- .../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 | 2 +- .../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 | 2 +- .../advancements/recipes/dolomite_wall.json | 2 +- .../advancements/recipes/gabbro_brick.json | 2 +- .../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 | 2 +- .../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 | 2 +- .../advancements/recipes/gabbro_wall.json | 2 +- .../advancements/recipes/gneiss_brick.json | 2 +- .../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 | 2 +- .../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 | 2 +- .../advancements/recipes/gneiss_wall.json | 2 +- .../advancements/recipes/granite_brick.json | 2 +- .../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 | 2 +- .../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 | 2 +- .../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 | 2 +- .../advancements/recipes/hornfels_wall.json | 2 +- .../advancements/recipes/limestone_brick.json | 2 +- .../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 | 2 +- .../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 | 2 +- .../advancements/recipes/limestone_wall.json | 2 +- .../advancements/recipes/marble_brick.json | 2 +- .../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 | 2 +- .../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 | 2 +- .../advancements/recipes/marble_wall.json | 2 +- .../recipes/novaculite_brick.json | 2 +- .../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 | 2 +- .../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 | 2 +- .../advancements/recipes/novaculite_wall.json | 2 +- .../advancements/recipes/pegmatite_brick.json | 2 +- .../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 | 2 +- .../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 | 2 +- .../advancements/recipes/pegmatite_wall.json | 2 +- .../recipes/peridotite_brick.json | 2 +- .../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 | 2 +- .../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 | 2 +- .../advancements/recipes/peridotite_wall.json | 2 +- .../advancements/recipes/phyllite_brick.json | 2 +- .../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 | 2 +- .../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 | 2 +- .../advancements/recipes/phyllite_wall.json | 2 +- .../advancements/recipes/quartzite_brick.json | 2 +- .../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 | 2 +- .../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 | 2 +- .../advancements/recipes/quartzite_wall.json | 2 +- .../advancements/recipes/rhyolite_brick.json | 2 +- .../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 | 2 +- .../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 | 2 +- .../advancements/recipes/rhyolite_wall.json | 2 +- .../advancements/recipes/rock_salt_brick.json | 2 +- .../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 | 2 +- .../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 | 2 +- .../advancements/recipes/rock_salt_wall.json | 2 +- .../advancements/recipes/schist_brick.json | 2 +- .../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 | 2 +- .../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 | 2 +- .../advancements/recipes/schist_wall.json | 2 +- .../advancements/recipes/scoria_brick.json | 2 +- .../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 | 2 +- .../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 | 2 +- .../advancements/recipes/scoria_wall.json | 2 +- .../advancements/recipes/shale_brick.json | 2 +- .../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 | 2 +- .../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 | 2 +- .../advancements/recipes/shale_wall.json | 2 +- .../advancements/recipes/siltstone_brick.json | 2 +- .../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 | 2 +- .../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 | 2 +- .../advancements/recipes/siltstone_wall.json | 2 +- .../advancements/recipes/slate_brick.json | 2 +- .../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 | 2 +- .../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 | 2 +- .../advancements/recipes/slate_wall.json | 2 +- .../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(+), 527 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 4d48967ee..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 b32b8ee29..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 c1d4b30e7..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 5bed5687d..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 1eef69a2a..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 c4eb02d80..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 a0b4d3cfc..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": [ { - "item": "mineralogy: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 40080159a..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": [ { - "item": "mineralogy: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 3c4aa5740..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": [ { - "item": "mineralogy: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 c8e80ef08..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 8f60710a3..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 d7884d2fc..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 2320eabac..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 d772a2de7..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 a9abe0911..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 c38f7806e..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 9d77ee006..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 e898cd1c7..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 2dbb5c9f4..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 9b5244656..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 5ac01590e..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 92656e3b4..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 37b27623e..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 8e0263f15..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 435e464dc..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 7adc9cdf2..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 7b22683a5..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 48505211b..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 9d0b0d151..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 b79fb912d..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 d021ea07c..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 e364cb4bb..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 eece87437..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 76334b5e8..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 fec9861c0..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 b035f1db0..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 226096b53..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 9c57a3fbc..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 1b723acc3..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 0bd7afafa..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 63ee47152..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 f520d9af0..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 6be29aa3f..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 b951f58fb..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 374feaede..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 c42fb8740..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 5b9a56d25..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 54cd7b406..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 aeb861adb..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 75e2d0cb9..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 6680e9fb1..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 dc02bb446..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 3b91a283b..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 6e3df2363..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 ee13cca90..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 70115d023..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 1bca727f7..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 7e3729c9b..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 fe90bce0d..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 5a8771785..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 d0db8a76a..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 aa231fe15..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 53ca03852..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 9d5d717d4..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 46e12f473..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 7e300c173..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 7a9aafb3f..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 933a5e637..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 5f8fd598a..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 f1e0c8d40..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 e87f4ab00..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 89bbb99dc..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 81120f308..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 495278633..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 c3e257fe2..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 1cb82c585..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 eb28866f1..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 568b2f577..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 242af868f..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 e391b251f..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 6d1d3f164..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 a49a195d7..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 51aa4350f..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 eed16fc5f..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 fce0bf6be..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 06937aa98..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 16fe143a0..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 c41ec6b0e..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 aec10cdb2..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 51c973b4a..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 c907c9fe8..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 79564145e..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 8045d68b9..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 bce0db41a..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 aeb949783..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,7 +22,7 @@ "conditions": { "items": [ { - "item": "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 84ce4f432..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": [ { - "item": "mineralogy: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 b72622774..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": [ { - "item": "mineralogy: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 b54e0ad3c..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": [ { - "item": "mineralogy: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 11f0aeb01..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": [ { - "item": "mineralogy: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 7ac14a387f051ae406b46d0a8c32c6c40ca6c84a Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Thu, 27 Aug 2026 16:36:48 +0100 Subject: [PATCH 6/8] 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 2fb43b19bd28e512882f68a6ceb7b69eab196bd2 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Thu, 27 Aug 2026 21:55:15 +0100 Subject: [PATCH 7/8] 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 9d9bad3f4a808f83f7d9e880527be9cd71d0575a Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Fri, 28 Aug 2026 13:26:23 +0100 Subject: [PATCH 8/8] 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"));