From fbf77acde8fc665863392e62964555db9fe6077e Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Fri, 2 Oct 2026 14:21:22 +0100 Subject: [PATCH 1/4] Prepare ore texture overlays for 1.13 Add Kiri's two-layer ore model with vanilla host textures and keep the original models where overlay artwork is not yet available. Test resource-pack overrides in the packaged client, keep the generator and fixtures out of release jars, and tidy comments and public documentation. --- .gitignore | 2 + CHANGELOG.txt | 3 + build.gradle | 59 ++++++- docs/COMPATIBILITY.md | 8 +- docs/VERSIONS.md | 11 +- docs/WORLDGEN.md | 4 +- docs/schemas/orespawn-4.0.16/README.md | 7 +- .../testmod/BaseMetalsClientProbe.java | 101 +++++++++++- .../mc/basemetals/BaseMetalsEvents.java | 2 +- .../mc/basemetals/content/ModContent.java | 12 +- .../mc/basemetals/content/RegistryHandle.java | 2 +- .../material/MaterialDefinition.java | 2 +- .../basemetals/data/BMBlockStateProvider.java | 150 ++++++++++++++++++ .../basemetals/data/OreOverlayModelTest.java | 117 ++++++++++++++ .../data/ResourceIntegrityTest.java | 7 + tools/generate_113_resources.js | 7 +- 16 files changed, 465 insertions(+), 29 deletions(-) create mode 100644 src/modelGenerator/java/zone/moddev/mc/basemetals/data/BMBlockStateProvider.java create mode 100644 src/test/java/zone/moddev/mc/basemetals/data/OreOverlayModelTest.java diff --git a/.gitignore b/.gitignore index 0b24ccc3..3e3fab99 100644 --- a/.gitignore +++ b/.gitignore @@ -106,3 +106,5 @@ __pycache__/ **/development.md **/REGISTRY_AUDIT.md **/registry_audit.md +**/ORE_TEXTURES.md +**/ore_textures.md diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 14a732e8..2c74224c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,8 @@ Base Metals 3.0.1.113021 +- Add support for Kiri's ore overlays on vanilla host textures, including + resource pack replacements. Ores keep their original texture when no overlay + is available. - Bring the 1.18.2 port to Minecraft 1.13.2 and Forge 25.0.223, running on Java 8. - Keep the historical blocks, items, recipes, fluids, loot, trades and advancements without requiring MMDLib or Additional Loot Tables. diff --git a/build.gradle b/build.gradle index fa9b9dc0..d0a811d1 100644 --- a/build.gradle +++ b/build.gradle @@ -75,6 +75,11 @@ tasks.withType(AbstractArchiveTask).configureEach { } sourceSets { + // Build-only model generator; not part of the mod jar. + modelGenerator { + compileClasspath += files(tasks.named('compileJava').flatMap { it.destinationDirectory }) + sourceSets.main.compileClasspath + runtimeClasspath += files(tasks.named('compileJava').flatMap { it.destinationDirectory }) + sourceSets.main.compileClasspath + } integrationTest { java.setSrcDirs(['src/integrationTest/java']) resources.setSrcDirs(['src/integrationTest/resources']) @@ -82,6 +87,9 @@ sourceSets { runtimeClasspath += sourceSets.main.output } } +dependencies { + testImplementation sourceSets.modelGenerator.output +} configurations { orespawnRelease integrationTestImplementation.extendsFrom implementation @@ -360,7 +368,10 @@ tasks.named('processResources', ProcessResources) { filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) { expand replaceProperties + [project: project] } - from('docs') { into 'META-INF/basemetals/docs' } + from('docs') { + exclude { it.file.name.equalsIgnoreCase('ore_textures.md') } + into 'META-INF/basemetals/docs' + } } tasks.named('jar', Jar) { @@ -527,8 +538,10 @@ def forbiddenReleasePath = { String entryName -> String name = entryName.replace('\\', '/').toLowerCase(Locale.ROOT) name.startsWith('com/mcmoddev/') || name.startsWith('ci-fixtures/') || name.startsWith('reference/') || name.startsWith('agent-notes/') || name.contains('/agent-notes/') + || name.endsWith('/ore_textures.md') || name.startsWith('src/integrationtest/') || name.startsWith('src/clientintegrationtest/') || name.startsWith('src/gametest/') + || name.startsWith('src/modelgenerator/') || name.endsWith('/bmblockstateprovider.class') || name.startsWith('src/integratedsmoke/') || name.startsWith('src/packagedclientsmoke/') || name.startsWith('src/upgradesmoke/') || name.startsWith('src/packagedserversmoke/') || name.contains('minecraft-mavenizer') || name.contains('/smoke/') @@ -686,8 +699,34 @@ def verifyGeneratedData = tasks.register('verifyGeneratedData', Exec) { } } } +def oreModelsDirectory = file('src/main/resources/assets/basemetals/models/block') +def oreModelSnapshot = { + fileTree(oreModelsDirectory) { include '*_ore.json' }.files.collectEntries { + [(it.name): sha256(it)] + } +} +def generateOreModels = tasks.register('generateOreModels', JavaExec) { + group = 'data generation' + description = 'Uses vanilla host textures when an ore overlay is present, otherwise keeps the legacy model.' + dependsOn tasks.named('modelGeneratorClasses') + classpath = sourceSets.modelGenerator.runtimeClasspath + mainClass = 'zone.moddev.mc.basemetals.data.BMBlockStateProvider' + args file('src/main/resources').absolutePath +} +tasks.named('processResources') { dependsOn generateOreModels } +def verifyGeneratedOreModels = tasks.register('verifyGeneratedOreModels') { + group = 'verification' + dependsOn generateOreModels + doLast { + if (generateOreModels.get().beforeGeneration != oreModelSnapshot()) { + throw new GradleException('Ore models were stale. Review and commit the generateOreModels output.') + } + } +} +generateOreModels.configure { doFirst { ext.beforeGeneration = oreModelSnapshot() } } tasks.named('check') { dependsOn verifyGeneratedData + dependsOn verifyGeneratedOreModels dependsOn tasks.named('verifyReleaseConfiguration') dependsOn tasks.named('verifyReleaseDependencies') dependsOn tasks.named('verifyMavenCoordinates') @@ -702,6 +741,7 @@ eclipse { classpath.entries.findAll { entry -> String path = entry.path?.replace('\\', '/') ?: '' path.startsWith('src/test/') || path.startsWith('src/integrationTest/') + || path.startsWith('src/modelGenerator/') || path.endsWith('/modelGenerator') }.each { entry -> entry.entryAttributes['test'] = 'true' } } } @@ -868,7 +908,7 @@ tasks.register('verifyEclipseProductionClasspath') { File launch = file(name) if (!launch.isFile()) throw new GradleException("Missing ${name}") String contents = launch.getText('UTF-8') - List forbidden = ['src/test', 'src/integrationTest', 'junit-', 'opentest4j-', + List forbidden = ['src/test', 'src/integrationTest', 'src/modelGenerator', 'junit-', 'opentest4j-', 'basemetalsprobe', 'C:\\Users\\John'] List leaked = forbidden.findAll { contents.contains(it) } if (!leaked.isEmpty() || !contents.contains('ATTR_EXCLUDE_TEST_CODE') @@ -948,6 +988,13 @@ def clientIntegrationTestModJar = tasks.register('clientIntegrationTestModJar', from clientIntegrationClasses from 'src/clientIntegrationTest/resources' } +def oreOverlayClientFixtures = layout.buildDirectory.dir('ore-overlay-client-fixtures') +def generateOreOverlayClientFixtures = tasks.register('generateOreOverlayClientFixtures', JavaExec) { + dependsOn tasks.named('modelGeneratorClasses') + classpath = sourceSets.modelGenerator.runtimeClasspath + mainClass = 'zone.moddev.mc.basemetals.data.BMBlockStateProvider' + args file('src/main/resources').absolutePath, '--client-fixtures', oreOverlayClientFixtures.get().asFile.absolutePath +} def packagedClientProbeJar = renamer.classes(clientIntegrationTestModJar) { map.from minecraft.dependency.toSrgFile output = layout.buildDirectory.file('client-integration-fixture/basemetalsclientprobe.jar') @@ -1057,6 +1104,7 @@ def preparePackagedClientIntegration = tasks.register('preparePackagedClientInte dependsOn releaseJar dependsOn packagedClientProbeJar dependsOn tasks.named('verifyReleaseDependencies') + dependsOn generateOreOverlayClientFixtures doLast { File runDirectory = prepareBuildOwnedRunDirectory( packagedClientRunDirectory.get().asFile, 'packaged-client-run') @@ -1066,7 +1114,12 @@ def preparePackagedClientIntegration = tasks.register('preparePackagedClientInte from releasedOreSpawnJar() into new File(runDirectory, 'mods') } - new File(runDirectory, 'options.txt').setText('fullscreen:false\nlang:en_us\n', 'UTF-8') + File overlayPack = new File(runDirectory, 'resourcepacks/basemetals-ore-overlay-fixture') + copy { from oreOverlayClientFixtures; into overlayPack } + new File(overlayPack, 'pack.mcmeta').setText( + '{"pack":{"pack_format":4,"description":"Base Metals ore overlay test fixture"}}\n', 'UTF-8') + new File(runDirectory, 'options.txt').setText( + 'fullscreen:false\nlang:en_us\nresourcePacks:["file/basemetals-ore-overlay-fixture"]\n', 'UTF-8') } } def packagedClientProcess = tasks.register('packagedClientProcess', Exec) { diff --git a/docs/COMPATIBILITY.md b/docs/COMPATIBILITY.md index 3cf616b2..cef3f8c9 100644 --- a/docs/COMPATIBILITY.md +++ b/docs/COMPATIBILITY.md @@ -1,7 +1,7 @@ # Compatibility -Base Metals' permanent public compatibility contract is data-driven. Recipes -consume Forge tags for ingots, nuggets, ores, storage blocks, dusts, small +Base Metals uses Forge item, block and fluid tags for compatibility. Recipes +accept tagged ingots, nuggets, ores, storage blocks, dusts, small dusts, blends, plates, rods, gears, casings, dense plates, crushed and purified ores, crystals, shards, clumps, dirty dusts, and molten fluids. @@ -12,9 +12,9 @@ the Base Metals item. On Minecraft 1.13.2 the copper ore, ingot, and storage tags contain Base Metals entries; other mods can add their equivalents through normal tag merging. -This target deliberately has no direct Mekanism, Thermal Expansion, Tinkers' +This version has no mod-specific plugins for Mekanism, Thermal Expansion, Tinkers' Construct, Ender IO, IC2, Thaumcraft, Dense Ores, VeinMiner, or Constructs -Armory plugin. Their version-specific 1.18 data and APIs are not valid on Forge +Armory. Their version-specific 1.18 data and APIs are not valid on Forge 25. Generic processors and tools can interoperate through Forge tags. Mineralogy is entirely optional. Base Metals does not link to Mineralogy Java diff --git a/docs/VERSIONS.md b/docs/VERSIONS.md index f3494b89..0d0a3217 100644 --- a/docs/VERSIONS.md +++ b/docs/VERSIONS.md @@ -5,15 +5,14 @@ Java 8. The Gradle build itself runs on Java `17.0.1+12` and uses ForgeGradle `7.0.34` with Gradle `9.6.1`; those build-time runtimes do not change the Java 8 requirement of the released mod. -Development, CI, and release qualification use the exact public OreSpawn +Builds and tests use the published OreSpawn `4.1.0.113021` release (CurseForge project `245586`, file `9035885`, SHA-256 `66C9CC5F8BE8F08F3DD5FA26EBEA79B52972B2FB86CB4DADBEEBC29AC01D3435`). -The runtime contract is OreSpawn `[4.0.16.113021,5.0.0)` for Minecraft 1.13.2. +At runtime, Base Metals requires OreSpawn `[4.0.16.113021,5.0.0)` for Minecraft 1.13.2. -The published dependency is resolved through CurseMaven. CI stages the same -checksum-verified file in a temporary Maven mirror. Local candidate repositories -are no longer used. The schema-3 provider remains compatible with the supported -OreSpawn 4 versions, so the runtime dependency range is unchanged. +Builds download this file through CurseMaven. CI verifies the download and +stages it in a temporary Maven repository. The schema-3 provider supports the +OreSpawn versions in the runtime range above. Release artifacts use Maven coordinate `zone.moddev.mc.basemetals:BaseMetals:3.0.1.113021`. diff --git a/docs/WORLDGEN.md b/docs/WORLDGEN.md index 4287aa52..7e8946b8 100644 --- a/docs/WORLDGEN.md +++ b/docs/WORLDGEN.md @@ -1,8 +1,8 @@ # OreSpawn world generation Base Metals requires OreSpawn `[4.0.16.113021,5.0.0)` and packages provider -schema 3, revision 1 at `data/basemetals/orespawn/provider.json`. Development, -CI, and release qualification use the exact OreSpawn `4.1.0.113021` release. +schema 3, revision 1 at `data/basemetals/orespawn/provider.json`. Builds and +tests use the published OreSpawn `4.1.0.113021` release. The provider declares ores only: it has no rocks, geomes, biome rules, terrain dimensions, formations, fluid deposits, vanilla suppression, or strata diff --git a/docs/schemas/orespawn-4.0.16/README.md b/docs/schemas/orespawn-4.0.16/README.md index 1b35f05e..d3c145e6 100644 --- a/docs/schemas/orespawn-4.0.16/README.md +++ b/docs/schemas/orespawn-4.0.16/README.md @@ -1,6 +1,5 @@ # OreSpawn 4.0.16 schemas -This directory is a vendored verification snapshot of the public OreSpawn -4.0.16 schema documents. Base Metals validates its schema-3, revision-1 -provider against this exact snapshot during `check`; the runtime dependency -range remains `[4.0.1,5.0.0)`. +These are the public OreSpawn 4.0.16 schema documents used to validate Base +Metals' schema-3, revision-1 provider during `check`. The supported runtime +versions are listed in [Supported versions](../../VERSIONS.md). diff --git a/src/clientIntegrationTest/java/zone/moddev/mc/basemetals/testmod/BaseMetalsClientProbe.java b/src/clientIntegrationTest/java/zone/moddev/mc/basemetals/testmod/BaseMetalsClientProbe.java index 57db2db7..62c87498 100644 --- a/src/clientIntegrationTest/java/zone/moddev/mc/basemetals/testmod/BaseMetalsClientProbe.java +++ b/src/clientIntegrationTest/java/zone/moddev/mc/basemetals/testmod/BaseMetalsClientProbe.java @@ -1,5 +1,6 @@ package zone.moddev.mc.basemetals.testmod; +import java.awt.image.BufferedImage; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -8,16 +9,23 @@ import java.util.Properties; import java.util.Random; +import javax.imageio.ImageIO; + import zone.moddev.mc.basemetals.ModTabs; import zone.moddev.mc.basemetals.content.FluidContent; import zone.moddev.mc.basemetals.content.ModContent; import zone.moddev.mc.basemetals.material.MaterialCatalogue; +import zone.moddev.mc.basemetals.material.MaterialDefinition; +import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiMainMenu; import net.minecraft.client.renderer.model.BakedQuad; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.item.ItemStack; +import net.minecraft.resources.IResource; +import net.minecraft.util.BlockRenderLayer; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.GameType; import net.minecraft.world.WorldSettings; @@ -33,7 +41,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -/** Build-only packaged-client probe; this class is never part of the public JAR. */ +/** Checks models and renders a disposable world in the packaged Forge client. */ @Mod(BaseMetalsClientProbe.MODID) @Mod.EventBusSubscriber(modid = BaseMetalsClientProbe.MODID, value = Dist.CLIENT) public final class BaseMetalsClientProbe { @@ -101,12 +109,103 @@ private static void validateClientContent(Minecraft minecraft) throws IOExceptio } validateBucketModel(minecraft, "mercury_bucket"); validateBucketModel(minecraft, "tin_bucket"); + validateOreModels(minecraft); minecraft.getResourceManager().getResource( new ResourceLocation("basemetals", "textures/item/adamantine_sword.png")); minecraft.getResourceManager().getResource( new ResourceLocation("basemetals", "textures/block/adamantine_block.png")); } + private static void validateOreModels(Minecraft minecraft) throws IOException { + int ores = 0; + for (MaterialDefinition material : MaterialCatalogue.ALL) { + if (!material.hasOre()) continue; + ores++; + + String name = material.name() + "_ore"; + String host = "minecraft:block/stone"; + if ("adamantine".equals(material.name()) || "coldiron".equals(material.name())) { + host = "minecraft:block/netherrack"; + } else if ("starsteel".equals(material.name())) { + host = "minecraft:block/end_stone"; + } + + Block block = ModContent.blocksById().get(name).get(); + require(block.getRenderLayer() == BlockRenderLayer.CUTOUT_MIPPED, name + " is not cutout-mipped"); + + IBakedModel blockModel = minecraft.getBlockRendererDispatcher().getModelForState(block.getDefaultState()); + validateOreModel(blockModel, block, name, host); + ItemStack stack = new ItemStack(ModContent.item(name).get()); + IBakedModel itemModel = minecraft.getItemRenderer().getItemModelWithOverrides(stack, null, null); + validateOreModel(itemModel, null, name + " item", host); + } + + require(ores == 13, "overlay ore count"); + validateHostOverride(minecraft, "stone", "tin"); + validateHostOverride(minecraft, "netherrack", "coldiron"); + validateHostOverride(minecraft, "end_stone", "starsteel"); + LOGGER.info("BASEMETALS_ORE_OVERLAY_PROBE PASS ores={} host_overrides=3", Integer.valueOf(ores)); + } + + private static void validateOreModel(IBakedModel model, Block block, String name, String host) { + require(host.equals(model.getParticleTexture().getName().toString()), name + " particle host"); + Random random = new Random(42L); + require(model.getQuads(block == null ? null : block.getDefaultState(), null, random).isEmpty(), + name + " has unexpected unculled faces"); + + for (EnumFacing side : EnumFacing.values()) { + List quads = model.getQuads(block == null ? null : block.getDefaultState(), side, random); + require(quads.size() == 2, name + " should have base and overlay on " + side); + boolean hasBase = false; + boolean hasOverlay = false; + for (BakedQuad quad : quads) { + String texture = quad.getSprite().getName().toString(); + hasBase |= host.equals(texture); + hasOverlay |= "minecraft:block/glass".equals(texture); + require(!"missingno".equals(quad.getSprite().getName().getPath()), name + " missing texture"); + validateOreVertices(quad, "minecraft:block/glass".equals(texture), name); + if ("minecraft:block/glass".equals(texture)) { + require(quad.getSprite().isPixelTransparent(0, 8, 8), name + " overlay lost transparency"); + } + } + + require(hasBase && hasOverlay, name + " lost a texture layer on " + side); + } + } + + private static void validateOreVertices(BakedQuad quad, boolean overlay, String name) { + int[] vertices = quad.getVertexData(); + int stride = vertices.length / 4; + float low = overlay ? -0.001F / 16 : 0; + float high = overlay ? 16.001F / 16 : 1; + + for (int vertex = 0; vertex < 4; vertex++) { + for (int axis = 0; axis < 3; axis++) { + float coordinate = Float.intBitsToFloat(vertices[vertex * stride + axis]); + require(Math.min(Math.abs(coordinate - low), Math.abs(coordinate - high)) < 0.000001F, + name + " incorrect " + (overlay ? "overlay" : "base") + " vertex"); + } + } + } + + private static void validateHostOverride(Minecraft minecraft, String host, String source) throws IOException { + try (IResource replacement = minecraft.getResourceManager().getResource( + new ResourceLocation("minecraft", "textures/block/" + host + ".png")); + IResource fixture = minecraft.getResourceManager().getResource( + new ResourceLocation("basemetals", "textures/block/" + source + "_ore.png"))) { + BufferedImage actual = ImageIO.read(replacement.getInputStream()); + BufferedImage expected = ImageIO.read(fixture.getInputStream()); + require(actual.getWidth() == expected.getWidth() && actual.getHeight() == expected.getHeight(), + host + " resource-pack image size"); + + for (int y = 0; y < actual.getHeight(); y++) { + for (int x = 0; x < actual.getWidth(); x++) { + require(actual.getRGB(x, y) == expected.getRGB(x, y), host + " resource-pack replacement"); + } + } + } + } + private static void validateBucketModel(Minecraft minecraft, String name) { ItemStack stack = new ItemStack(ModContent.item(name).get()); IBakedModel model = minecraft.getItemRenderer().getItemModelWithOverrides(stack, null, null); diff --git a/src/main/java/zone/moddev/mc/basemetals/BaseMetalsEvents.java b/src/main/java/zone/moddev/mc/basemetals/BaseMetalsEvents.java index 7c439361..13b97ae0 100644 --- a/src/main/java/zone/moddev/mc/basemetals/BaseMetalsEvents.java +++ b/src/main/java/zone/moddev/mc/basemetals/BaseMetalsEvents.java @@ -41,7 +41,7 @@ import net.minecraftforge.fml.common.gameevent.PlayerEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; -/** Target-native gameplay handlers with no proxy or MMDLib dependency. */ +/** Handles crushing, shield upgrades and material equipment effects. */ public final class BaseMetalsEvents { @SubscribeEvent(priority = EventPriority.LOWEST) public void onBreak(BlockEvent.BreakEvent event) { diff --git a/src/main/java/zone/moddev/mc/basemetals/content/ModContent.java b/src/main/java/zone/moddev/mc/basemetals/content/ModContent.java index 0a416078..3a6a5b59 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/ModContent.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/ModContent.java @@ -36,6 +36,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemGroup; +import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.IRegistry; import net.minecraftforge.common.ToolType; @@ -43,7 +44,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -/** All content registration, generated from the immutable catalogues. */ +/** Registers material blocks, items and fluids from the catalogue. */ @Mod.EventBusSubscriber(modid = BaseMetals.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public final class ModContent { private static final Map> BLOCKS_BY_ID = @@ -202,7 +203,7 @@ private static void registerMaterial(MaterialDefinition material) { String id = material.name() + "_ore"; blocks.put("ore", registerBlock(id, new Supplier() { - @Override public Block get() { return new HarvestBlock(oreProperties(material), material.requiredHarvestLevel()); } + @Override public Block get() { return new HarvestOre(oreProperties(material), material.requiredHarvestLevel()); } }, true)); items.put("ore", ITEMS_BY_ID.get(id)); } @@ -525,6 +526,13 @@ private static class HarvestBlock extends Block { @Override public ToolType getHarvestTool(net.minecraft.block.state.IBlockState state) { return ToolType.PICKAXE; } @Override public int getHarvestLevel(net.minecraft.block.state.IBlockState state) { return level; } } + + private static class HarvestOre extends HarvestBlock { + HarvestOre(Properties properties, int level) { super(properties, level); } + + // Cutout rendering leaves the transparent parts of the ore overlay clear. + @Override public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT_MIPPED; } + } private static class HarvestPane extends BlockPane { private final int level; HarvestPane(Properties properties, int level) { super(properties); this.level = level; } diff --git a/src/main/java/zone/moddev/mc/basemetals/content/RegistryHandle.java b/src/main/java/zone/moddev/mc/basemetals/content/RegistryHandle.java index 4e37f4d7..7f9c2fbd 100644 --- a/src/main/java/zone/moddev/mc/basemetals/content/RegistryHandle.java +++ b/src/main/java/zone/moddev/mc/basemetals/content/RegistryHandle.java @@ -3,7 +3,7 @@ import java.util.Objects; import java.util.function.Supplier; -/** Small target-native replacement for the later Forge RegistryObject API. */ +/** Holds an entry until its Forge registration event supplies the instance. */ public final class RegistryHandle implements Supplier { private final String id; private T value; diff --git a/src/main/java/zone/moddev/mc/basemetals/material/MaterialDefinition.java b/src/main/java/zone/moddev/mc/basemetals/material/MaterialDefinition.java index 9ad347e8..0d5060b6 100644 --- a/src/main/java/zone/moddev/mc/basemetals/material/MaterialDefinition.java +++ b/src/main/java/zone/moddev/mc/basemetals/material/MaterialDefinition.java @@ -4,7 +4,7 @@ import net.minecraft.inventory.EntityEquipmentSlot; -/** Immutable source of truth for every Base Metals material. */ +/** Material statistics and form availability used by registration and recipes. */ public final class MaterialDefinition { public enum Kind { ORE, RARE_ORE, ALLOY, RARE_ALLOY, MERCURY; diff --git a/src/modelGenerator/java/zone/moddev/mc/basemetals/data/BMBlockStateProvider.java b/src/modelGenerator/java/zone/moddev/mc/basemetals/data/BMBlockStateProvider.java new file mode 100644 index 00000000..acdf4055 --- /dev/null +++ b/src/modelGenerator/java/zone/moddev/mc/basemetals/data/BMBlockStateProvider.java @@ -0,0 +1,150 @@ +package zone.moddev.mc.basemetals.data; + +import java.io.IOException; +import java.io.Reader; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; + +import zone.moddev.mc.basemetals.material.MaterialCatalogue; +import zone.moddev.mc.basemetals.material.MaterialDefinition; + +/** + * Kiri's ore-overlay model, written as JSON for Forge 1.13's data pipeline. + * The newer Forge BlockStateProvider and BlockModelBuilder are not available here. + * + * @author KiriCattus (Kiri), original two-layer model + */ +public final class BMBlockStateProvider { + private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); + private static final String[] FACES = {"down", "up", "north", "south", "west", "east"}; + + private BMBlockStateProvider() {} + + public static void main(String[] args) throws IOException { + if (args.length != 1 && (args.length != 3 || !"--client-fixtures".equals(args[1]))) { + throw new IllegalArgumentException("Expected a resource directory, optionally followed by --client-fixtures "); + } + + Path resources = Paths.get(args[0]); + boolean clientFixture = args.length == 3; + Path output = clientFixture ? Paths.get(args[2]) : resources; + + for (MaterialDefinition material : MaterialCatalogue.ALL) { + if (!material.hasOre()) continue; + + String blockName = material.name() + "_ore"; + String baseTexture = baseTexture(material.name()); + String overlayTexture = "basemetals:block/ore_overlays/" + blockName; + Path overlay = resources.resolve("assets/basemetals/textures/block/ore_overlays/" + + blockName + ".png"); + + JsonObject model = clientFixture + ? createOverlayOre(baseTexture, "minecraft:block/glass") + : modelFor(blockName, baseTexture, overlayTexture, Files.isRegularFile(overlay)); + + write(output.resolve("assets/basemetals/models/block/" + blockName + ".json"), model); + } + + if (clientFixture) { + // The client probe enables these host replacements in a test-only resource pack. + copyHostFixture(resources, output, "tin", "stone"); + copyHostFixture(resources, output, "coldiron", "netherrack"); + copyHostFixture(resources, output, "starsteel", "end_stone"); + } + } + + public static String baseTexture(String material) { + if ("adamantine".equals(material) || "coldiron".equals(material)) { + return "minecraft:block/netherrack"; + } + if ("starsteel".equals(material)) return "minecraft:block/end_stone"; + + return "minecraft:block/stone"; + } + + public static JsonObject modelFor(String blockName, String baseTexture, + String overlayTexture, boolean hasOverlay) { + if (hasOverlay) return createOverlayOre(baseTexture, overlayTexture); + + // Keep the shipped artwork until Kiri supplies this ore's transparent overlay. + JsonObject model = new JsonObject(); + model.addProperty("parent", "block/cube_all"); + JsonObject textures = new JsonObject(); + textures.addProperty("all", "basemetals:block/" + blockName); + model.add("textures", textures); + return model; + } + + public static JsonObject createOverlayOre(String baseTexture, String overlayTexture) { + JsonObject model = new JsonObject(); + model.addProperty("parent", "minecraft:block/block"); + + JsonObject textures = new JsonObject(); + textures.addProperty("particle", baseTexture); + textures.addProperty("base", baseTexture); + textures.addProperty("overlay", overlayTexture); + model.add("textures", textures); + + JsonArray elements = new JsonArray(); + + // Element 1: base block (Stone, Netherrack or End Stone). + elements.add(element(0, 16, "#base")); + + // Element 2: Kiri's 0.001 offset keeps the overlay from z-fighting with the base. + elements.add(element(-0.001F, 16.001F, "#overlay")); + + model.add("elements", elements); + return model; + } + + private static JsonObject element(float from, float to, String texture) { + JsonObject element = new JsonObject(); + element.add("from", point(from)); + element.add("to", point(to)); + + JsonObject faces = new JsonObject(); + for (String direction : FACES) { + JsonObject face = new JsonObject(); + face.addProperty("texture", texture); + face.addProperty("cullface", direction); + faces.add(direction, face); + } + + element.add("faces", faces); + return element; + } + + private static JsonArray point(float coordinate) { + JsonArray point = new JsonArray(); + for (int axis = 0; axis < 3; axis++) point.add(coordinate); + return point; + } + + private static void write(Path file, JsonObject model) throws IOException { + if (Files.isRegularFile(file)) { + try (Reader reader = Files.newBufferedReader(file, StandardCharsets.UTF_8)) { + if (model.equals(new JsonParser().parse(reader))) return; + } + } + + Files.createDirectories(file.getParent()); + Files.write(file, (GSON.toJson(model) + "\n").getBytes(StandardCharsets.UTF_8)); + } + + private static void copyHostFixture(Path resources, Path output, String ore, String host) + throws IOException { + Path target = output.resolve("assets/minecraft/textures/block/" + host + ".png"); + Files.createDirectories(target.getParent()); + Files.copy(resources.resolve("assets/basemetals/textures/block/" + ore + "_ore.png"), + target, StandardCopyOption.REPLACE_EXISTING); + } +} diff --git a/src/test/java/zone/moddev/mc/basemetals/data/OreOverlayModelTest.java b/src/test/java/zone/moddev/mc/basemetals/data/OreOverlayModelTest.java new file mode 100644 index 00000000..22086ae6 --- /dev/null +++ b/src/test/java/zone/moddev/mc/basemetals/data/OreOverlayModelTest.java @@ -0,0 +1,117 @@ +package zone.moddev.mc.basemetals.data; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Map; + +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; + +import zone.moddev.mc.basemetals.material.MaterialCatalogue; +import zone.moddev.mc.basemetals.material.MaterialDefinition; + +class OreOverlayModelTest { + @TempDir Path resources; + + @Test + void kirisTwoLayerGeometryKeepsTheOffsetAndAllSixCullFaces() { + JsonObject model = BMBlockStateProvider.createOverlayOre( + "minecraft:block/stone", "basemetals:block/ore_overlays/tin_ore"); + + assertEquals("minecraft:block/block", model.get("parent").getAsString()); + JsonObject textures = model.getAsJsonObject("textures"); + assertEquals("minecraft:block/stone", textures.get("particle").getAsString()); + assertEquals("minecraft:block/stone", textures.get("base").getAsString()); + assertEquals("basemetals:block/ore_overlays/tin_ore", textures.get("overlay").getAsString()); + + JsonArray elements = model.getAsJsonArray("elements"); + assertEquals(2, elements.size()); + assertElement(elements.get(0).getAsJsonObject(), 0, 16, "#base"); + assertElement(elements.get(1).getAsJsonObject(), -0.001, 16.001, "#overlay"); + } + + @Test + void everyOreUsesItsVanillaHostTexture() { + int ores = 0; + for (MaterialDefinition material : MaterialCatalogue.ALL) { + if (!material.hasOre()) continue; + ores++; + + String expected = "minecraft:block/stone"; + if ("adamantine".equals(material.name()) || "coldiron".equals(material.name())) { + expected = "minecraft:block/netherrack"; + } else if ("starsteel".equals(material.name())) { + expected = "minecraft:block/end_stone"; + } + + assertEquals(expected, BMBlockStateProvider.baseTexture(material.name())); + JsonObject model = BMBlockStateProvider.modelFor(material.name() + "_ore", expected, + "basemetals:block/ore_overlays/" + material.name() + "_ore", true); + assertEquals(expected, model.getAsJsonObject("textures").get("base").getAsString()); + } + + assertEquals(13, ores); + } + + @Test + void missingOverlaysKeepTheCurrentArtworkWithoutMissingTextureReferences() { + JsonObject model = BMBlockStateProvider.modelFor("tin_ore", "minecraft:block/stone", + "basemetals:block/ore_overlays/tin_ore", false); + + assertEquals("block/cube_all", model.get("parent").getAsString()); + assertEquals("basemetals:block/tin_ore", model.getAsJsonObject("textures").get("all").getAsString()); + assertFalse(model.has("elements")); + assertFalse(model.toString().contains("ore_overlays")); + } + + @Test + void generationEnablesOnlySuppliedOverlaysAndCanReturnToTheLegacyModel() throws Exception { + Path overlay = resources.resolve("assets/basemetals/textures/block/ore_overlays/tin_ore.png"); + Files.createDirectories(overlay.getParent()); + Files.copy(Paths.get("src/main/resources/assets/basemetals/textures/block/tin_ore.png"), overlay); + + BMBlockStateProvider.main(new String[] {resources.toString()}); + assertTrue(readModel("tin_ore").has("elements")); + assertFalse(readModel("copper_ore").has("elements")); + byte[] first = Files.readAllBytes(modelPath("tin_ore")); + BMBlockStateProvider.main(new String[] {resources.toString()}); + org.junit.jupiter.api.Assertions.assertArrayEquals(first, Files.readAllBytes(modelPath("tin_ore"))); + + Files.delete(overlay); + BMBlockStateProvider.main(new String[] {resources.toString()}); + assertFalse(readModel("tin_ore").has("elements")); + } + + private static void assertElement(JsonObject element, double from, double to, String texture) { + for (int axis = 0; axis < 3; axis++) { + assertEquals(from, element.getAsJsonArray("from").get(axis).getAsDouble(), 0.000001); + assertEquals(to, element.getAsJsonArray("to").get(axis).getAsDouble(), 0.000001); + } + + JsonObject faces = element.getAsJsonObject("faces"); + assertEquals(6, faces.entrySet().size()); + for (Map.Entry face : faces.entrySet()) { + assertEquals(texture, face.getValue().getAsJsonObject().get("texture").getAsString()); + assertEquals(face.getKey(), face.getValue().getAsJsonObject().get("cullface").getAsString()); + } + } + + private Path modelPath(String name) { + return resources.resolve("assets/basemetals/models/block/" + name + ".json"); + } + + private JsonObject readModel(String name) throws Exception { + return new JsonParser().parse(new String(Files.readAllBytes(modelPath(name)), + StandardCharsets.UTF_8)).getAsJsonObject(); + } +} diff --git a/src/test/java/zone/moddev/mc/basemetals/data/ResourceIntegrityTest.java b/src/test/java/zone/moddev/mc/basemetals/data/ResourceIntegrityTest.java index 64bc4829..abc97419 100644 --- a/src/test/java/zone/moddev/mc/basemetals/data/ResourceIntegrityTest.java +++ b/src/test/java/zone/moddev/mc/basemetals/data/ResourceIntegrityTest.java @@ -190,6 +190,13 @@ void transparentBlockTexturesRemainInKnownCutoutFamilies() throws Exception { else if (id.endsWith("_trapdoor")) expected.add(id + ".png"); } assertEquals(78, expected.size()); + for (String block : strings(manifest().getAsJsonArray("blocks"))) { + String id = path(block); + if (id.endsWith("_ore") && Files.isRegularFile(MAIN.resolve( + "assets/basemetals/textures/block/ore_overlays/" + id + ".png"))) { + expected.add(id + ".png"); + } + } Set transparent = new LinkedHashSet(); for (Path texture : files(MAIN.resolve("assets/basemetals/textures/block"), ".png")) { if (hasTransparentPixel(texture)) transparent.add(texture.getFileName().toString()); diff --git a/tools/generate_113_resources.js b/tools/generate_113_resources.js index 351940a6..69243309 100644 --- a/tools/generate_113_resources.js +++ b/tools/generate_113_resources.js @@ -1,8 +1,7 @@ /* - * Deterministic compatibility pass over the catalogue-generated 1.18 data. - * Minecraft 1.13 predates blast furnaces, block loot tables, global loot - * modifiers, tall wall sides, and the optional integrations shipped by the - * 1.18 branch. Keep this conversion mechanical and idempotent. + * Converts the catalogue-generated resources to Minecraft 1.13 formats. + * Removes unsupported recipes and integrations, and converts block states, + * item models and tags to the names and formats used by Forge 25. */ 'use strict'; From 1a51a35af809562623ea0913d0b2e334eafeb2db Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Fri, 2 Oct 2026 15:32:41 +0100 Subject: [PATCH 2/4] Fix Gradle launches and allow newer Java 8 updates --- CHANGELOG.txt | 2 ++ README.md | 17 ++++++++- build.gradle | 99 +++++++++++++++++++++++++++++++++------------------ 3 files changed, 83 insertions(+), 35 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 2c74224c..4aad869f 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -3,6 +3,8 @@ Base Metals 3.0.1.113021 - Add support for Kiri's ore overlays on vanilla host textures, including resource pack replacements. Ores keep their original texture when no overlay is available. +- Fix Gradle game launches so Forge prepares the assets and native libraries. + Allow newer Java 8 updates for development while keeping release builds pinned. - Bring the 1.18.2 port to Minecraft 1.13.2 and Forge 25.0.223, running on Java 8. - Keep the historical blocks, items, recipes, fluids, loot, trades and advancements without requiring MMDLib or Additional Loot Tables. diff --git a/README.md b/README.md index 637512cb..af99b1e4 100644 --- a/README.md +++ b/README.md @@ -116,7 +116,22 @@ can consume the common tags without linking to Base Metals internals. See Base Metals uses ForgeGradle `7.0.34` and Gradle `9.6.1`. Gradle runs on Java 17, ForgeGradle's legacy Minecraft transformation utility runs on Java 25, and -all production code compiles and runs on the exact Java 8 toolchain. +the mod compiles and runs on Java 8. Development builds accept newer Java 8 +updates; release auditing requires Temurin `8.0.502+7` for reproducibility. +Node.js is also needed to generate and check the resource files. + +For a normal development build and client launch, use: + +```text +./gradlew build +./gradlew runClient +``` + +Run these tasks from IntelliJ's Gradle window or a terminal. ForgeGradle's +launcher prepares the assets and native libraries; no manual asset paths are +needed. The Gradle JVM should be Java 17, not the Java 8 game runtime. + +With the pinned release toolchain, run the full release checks: ```text ./gradlew clean check build javadoc verifyReleaseArtifacts writeReleaseChecksums diff --git a/build.gradle b/build.gradle index d0a811d1..cda3bcb9 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,6 @@ ext.release_tag = project.mod_version java { toolchain { languageVersion = JavaLanguageVersion.of(8) - vendor = JvmVendorSpec.ADOPTIUM } withSourcesJar() withJavadocJar() @@ -51,7 +50,6 @@ java { tasks.withType(JavaCompile).configureEach { javaCompiler = javaToolchains.compilerFor { languageVersion = JavaLanguageVersion.of(8) - vendor = JvmVendorSpec.ADOPTIUM } sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 @@ -100,15 +98,33 @@ configurations { println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} " + "(${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}" +def forgeRunModClassesDirectory = layout.buildDirectory.dir('forge-run-mod-classes/main') +def integrationTestModClassesDirectory = layout.buildDirectory.dir('forge-run-mod-classes/integration-test') +def forgeMainOutputPath = forgeRunModClassesDirectory.get().asFile.absolutePath +def mainModClasses = "${mod_id}%%${forgeMainOutputPath}${File.pathSeparator}${mod_id}%%${forgeMainOutputPath}" +def forgeProbeOutputPath = integrationTestModClassesDirectory.get().asFile.absolutePath +def probeModClasses = mainModClasses + "${File.pathSeparator}basemetalsprobe%%${forgeProbeOutputPath}" + + "${File.pathSeparator}basemetalsprobe%%${forgeProbeOutputPath}" +def forge25RunTargets = [client: 'fmluserdevclient', server: 'fmluserdevserver', + data: 'fmluserdevdata', runtimeProbeServer: 'fmluserdevserver', legacyUpgradeServer: 'fmluserdevserver'] + minecraft { mappings channel: project.mapping_channel, version: project.mapping_version runs { configureEach { + // Slime Launcher calls this entry point after preparing assets and natives. mainClass = 'net.minecraftforge.userdev.LaunchTesting' workingDir.convention layout.projectDirectory.dir('run') systemProperty 'forge.logging.markers', 'REGISTRIES' systemProperty 'forge.logging.console.level', 'info' mods { basemetals { source sourceSets.main } } + environment 'target', forge25RunTargets[name] + environment 'MCP_MAPPINGS', "${mapping_channel}_${mapping_version}" + environment 'MCP_VERSION', mcp_version + environment 'FORGE_VERSION', forge_version + environment 'FORGE_GROUP', 'net.minecraftforge' + environment 'MC_VERSION', minecraft_version + environment 'MOD_CLASSES', mainModClasses } register('client') register('server') { args '--nogui' } @@ -119,10 +135,12 @@ minecraft { } register('runtimeProbeServer') { workingDir.convention layout.buildDirectory.dir('integration-test-run') + environment 'MOD_CLASSES', probeModClasses args '--nogui' } register('legacyUpgradeServer') { workingDir.convention layout.buildDirectory.dir('legacy-upgrade-run') + environment 'MOD_CLASSES', probeModClasses systemProperty 'basemetalsprobe.mode', 'legacy-upgrade' args '--nogui' } @@ -134,8 +152,6 @@ sourceSets.main.resources { exclude '.cache/**' } -def forgeRunModClassesDirectory = layout.buildDirectory.dir('forge-run-mod-classes/main') -def integrationTestModClassesDirectory = layout.buildDirectory.dir('forge-run-mod-classes/integration-test') def prepareForgeRunModClasses = tasks.register('prepareForgeRunModClasses', Sync) { dependsOn tasks.named('classes') from sourceSets.main.output @@ -147,37 +163,22 @@ def prepareIntegrationTestModClasses = tasks.register('prepareIntegrationTestMod into integrationTestModClassesDirectory } -def configureForge25Run = { JavaExec runTask, String launchTarget -> - runTask.dependsOn prepareForgeRunModClasses - runTask.mainClass.set('net.minecraftforge.userdev.LaunchTesting') - runTask.environment 'target', launchTarget - runTask.environment 'MCP_MAPPINGS', "${mapping_channel}_${mapping_version}" - runTask.environment 'MCP_VERSION', mcp_version - runTask.environment 'FORGE_VERSION', forge_version - runTask.environment 'FORGE_GROUP', 'net.minecraftforge' - runTask.environment 'MC_VERSION', minecraft_version - String mainOutput = forgeRunModClassesDirectory.get().asFile.absolutePath - String modClasses = "${mod_id}%%${mainOutput}${File.pathSeparator}${mod_id}%%${mainOutput}" - if (runTask.name == 'runRuntimeProbeServer' || runTask.name == 'runLegacyUpgradeServer') { - runTask.dependsOn prepareIntegrationTestModClasses - String probeOutput = integrationTestModClassesDirectory.get().asFile.absolutePath - modClasses += "${File.pathSeparator}basemetalsprobe%%${probeOutput}" + - "${File.pathSeparator}basemetalsprobe%%${probeOutput}" - } - runTask.environment 'MOD_CLASSES', modClasses - runTask.doFirst { - File modsDirectory = new File(runTask.workingDir, 'mods') - if (!modsDirectory.isDirectory() && !modsDirectory.mkdirs()) { - throw new GradleException("Could not create development mods directory: ${modsDirectory}") +tasks.withType(JavaExec).configureEach { JavaExec runTask -> + def runName = forge25RunTargets.keySet().find { runTask.name == 'run' + it.capitalize() } + if (runName != null) { + runTask.dependsOn prepareForgeRunModClasses + if (runTask.name in ['runRuntimeProbeServer', 'runLegacyUpgradeServer']) { + runTask.dependsOn prepareIntegrationTestModClasses + } + runTask.doFirst { + File runDirectory = minecraft.runs.named(runName).get().workingDir.get().asFile + File modsDirectory = new File(runDirectory, 'mods') + if (!modsDirectory.isDirectory() && !modsDirectory.mkdirs()) { + throw new GradleException("Could not create development mods directory: ${modsDirectory}") + } } } } -tasks.withType(JavaExec).configureEach { JavaExec runTask -> - String launchTarget = [runClient: 'fmluserdevclient', runServer: 'fmluserdevserver', - runData: 'fmluserdevdata', runRuntimeProbeServer: 'fmluserdevserver', - runLegacyUpgradeServer: 'fmluserdevserver'][runTask.name] - if (launchTarget != null) configureForge25Run(runTask, launchTarget) -} def integrationTestRunDirectory = layout.buildDirectory.dir('integration-test-run') def prepareIntegrationTestRun = tasks.register('prepareIntegrationTestRun') { @@ -461,15 +462,43 @@ tasks.register('verifyJava8Toolchain') { dependsOn tasks.named('compileJava') doLast { def metadata = tasks.named('compileJava', JavaCompile).get().javaCompiler.get().metadata - if (configuredJavaToolchainVersion != '8.0.502+7' || metadata.languageVersion.asInt() != 8 + if (metadata.languageVersion.asInt() != 8) { + throw new GradleException("Minecraft 1.13.2 requires a Java 8 JDK, found " + + "${metadata.vendor} ${metadata.javaRuntimeVersion} at ${metadata.installationPath}") + } + logger.lifecycle("Java 8 development toolchain: ${metadata.vendor} ${metadata.javaRuntimeVersion}") + } +} + +tasks.register('verifyReleaseJava8Toolchain') { + group = 'verification' + description = 'Requires the pinned compiler for reproducible release artifacts.' + dependsOn tasks.named('verifyJava8Toolchain') + doLast { + def metadata = tasks.named('compileJava', JavaCompile).get().javaCompiler.get().metadata + if (configuredJavaToolchainVersion != '8.0.502+7' || metadata.javaRuntimeVersion != '1.8.0_502-b07' || !metadata.vendor.toString().toLowerCase(Locale.ROOT).contains('temurin')) { - throw new GradleException("Expected Eclipse Temurin ${configuredJavaToolchainVersion}, found " + + throw new GradleException("Release auditing requires Eclipse Temurin ${configuredJavaToolchainVersion}; " + + "ordinary build and runClient tasks accept other Java 8 updates. Found " + "${metadata.vendor} ${metadata.javaRuntimeVersion} at ${metadata.installationPath}") } } } +tasks.register('verifyDevelopmentLaunches') { + group = 'verification' + description = 'Checks that development runs use the ForgeGradle launcher.' + doLast { + ['runClient', 'runServer', 'runData', 'runRuntimeProbeServer', 'runLegacyUpgradeServer'].each { name -> + def run = tasks.named(name, JavaExec).get() + if (run.mainClass.get() != 'net.minecraftforge.launcher.Main') { + throw new GradleException("${name} bypasses Slime Launcher: ${run.mainClass.get()}") + } + } + } +} + tasks.register('verifyMavenCoordinates') { group = 'verification' dependsOn tasks.named('generatePomFileForMavenJavaPublication') @@ -551,6 +580,7 @@ def forbiddenReleasePath = { String entryName -> tasks.register('verifyReleaseArtifacts') { group = 'verification' + dependsOn tasks.named('verifyReleaseJava8Toolchain') dependsOn tasks.named('verifyReleaseConfiguration') dependsOn tasks.named('verifyReleaseDependencies') dependsOn tasks.named('verifyMavenCoordinates') @@ -725,6 +755,7 @@ def verifyGeneratedOreModels = tasks.register('verifyGeneratedOreModels') { } generateOreModels.configure { doFirst { ext.beforeGeneration = oreModelSnapshot() } } tasks.named('check') { + dependsOn tasks.named('verifyDevelopmentLaunches') dependsOn verifyGeneratedData dependsOn verifyGeneratedOreModels dependsOn tasks.named('verifyReleaseConfiguration') From dc50b364267f5437f6910adee9658752cb626658 Mon Sep 17 00:00:00 2001 From: KiriCattus <19393068+KiriCattus@users.noreply.github.com> Date: Fri, 2 Oct 2026 15:44:20 +0100 Subject: [PATCH 3/4] Removed base from ore textures so they can be used everywhere. --- .../textures/ore_overlays/adamantine_ore.png | Bin 0 -> 635 bytes .../textures/ore_overlays/antimony_ore.png | Bin 0 -> 325 bytes .../textures/ore_overlays/bismuth_ore.png | Bin 0 -> 325 bytes .../textures/ore_overlays/coldiron_ore.png | Bin 0 -> 569 bytes .../textures/ore_overlays/copper_ore.png | Bin 0 -> 262 bytes .../textures/ore_overlays/cupronickel_ore.png | Bin 0 -> 323 bytes .../textures/ore_overlays/lead_ore.png | Bin 0 -> 311 bytes .../textures/ore_overlays/mercury_ore.png | Bin 0 -> 262 bytes .../textures/ore_overlays/nickel_ore.png | Bin 0 -> 348 bytes .../textures/ore_overlays/pewter_ore.png | Bin 0 -> 323 bytes .../textures/ore_overlays/platinum_ore.png | Bin 0 -> 328 bytes .../textures/ore_overlays/silver_ore.png | Bin 0 -> 398 bytes .../textures/ore_overlays/starsteel_ore.png | Bin 0 -> 3837 bytes .../basemetals/textures/ore_overlays/tin_ore.png | Bin 0 -> 249 bytes .../textures/ore_overlays/zinc_ore.png | Bin 0 -> 331 bytes 15 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/basemetals/textures/ore_overlays/adamantine_ore.png create mode 100644 src/main/resources/assets/basemetals/textures/ore_overlays/antimony_ore.png create mode 100644 src/main/resources/assets/basemetals/textures/ore_overlays/bismuth_ore.png create mode 100644 src/main/resources/assets/basemetals/textures/ore_overlays/coldiron_ore.png create mode 100644 src/main/resources/assets/basemetals/textures/ore_overlays/copper_ore.png create mode 100644 src/main/resources/assets/basemetals/textures/ore_overlays/cupronickel_ore.png create mode 100644 src/main/resources/assets/basemetals/textures/ore_overlays/lead_ore.png create mode 100644 src/main/resources/assets/basemetals/textures/ore_overlays/mercury_ore.png create mode 100644 src/main/resources/assets/basemetals/textures/ore_overlays/nickel_ore.png create mode 100644 src/main/resources/assets/basemetals/textures/ore_overlays/pewter_ore.png create mode 100644 src/main/resources/assets/basemetals/textures/ore_overlays/platinum_ore.png create mode 100644 src/main/resources/assets/basemetals/textures/ore_overlays/silver_ore.png create mode 100644 src/main/resources/assets/basemetals/textures/ore_overlays/starsteel_ore.png create mode 100644 src/main/resources/assets/basemetals/textures/ore_overlays/tin_ore.png create mode 100644 src/main/resources/assets/basemetals/textures/ore_overlays/zinc_ore.png diff --git a/src/main/resources/assets/basemetals/textures/ore_overlays/adamantine_ore.png b/src/main/resources/assets/basemetals/textures/ore_overlays/adamantine_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..c3fe185edd311d34883d76d4f9a59da7988e647b GIT binary patch literal 635 zcmV->0)+jEP)z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy32;bRa{vGf6951U69E94oEQKA0pv+UK~y-6rBYpM6HyR7cXzYf zO}ZbE#A?!peuPpQC5l0VSOpay1O?yyW&IsKD)yyd5R4C^p%|gfM~xdz;%&0o-E>EG zp@BBh1UwG|bMDN!XYO3!Kf$Jvh0Ge|vw5_*g;($Qr`DW7xJcYuStT`|gflute>9ru zK)OhzQtPPw{0?hD#oKa;ttFBqND791j%7nfsa|9M6fl$+xNg83d0`&Y;#e{h@O>Yb zO#>2Rv|l@7e;uLHs6rru5fQ_DJH3INu>$ARgT*-%Gl2(NIXbInGlvB5=w^}hsE+nY z7oA=gal-`X93Q`ZVdos&&2G|@!VbN>|7?6ifH&oLtn~QD20MW* zB?jAbK=?i3qSN;gJIUM#{p|xSZi%RQwuJME*M2rM} z4cZ|giXwjWx>JkOs!C6<=V?Nqc~F5YFM^0*JHyG{0@yU;CS7>bW zs%DU?$nabjBhSULZI91%MWyF=9^+H}D>O~RU@$;b5+E^u_8JS>ZBk>4NNRCdyo2b1 ziowu^<2Yzp&H4U8fEUGk)V5v7QY37y993~ik>?i(@bKCVs?_U14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>~Q? zgt*q%*O!!(^!N8?WMmvUd3@jDgS!vx+kJ4~p%X{9?%J{c=%Jna_Z~cUJNEA0 zclf~ey}Neq+kJHZ!9!gCrvVLNED7=pW^j0RBMr#mEbxddW?gd)z4*}Q$iB}T#0+Y literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/basemetals/textures/ore_overlays/bismuth_ore.png b/src/main/resources/assets/basemetals/textures/ore_overlays/bismuth_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..c80e34b633515fd00ee0296b01a52c07e8e412bd GIT binary patch literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6XVU3I`u#fOS+@4BLl<6 ze(pbstU$g(vPY0F14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>~Q? zgt*q%*O!!(^!N8?WMmvWy!YU~9ea0e*|&S^(L;N7Y+ZkF-_AWdHy=K*>&U@9yS8sU zuy^~;?HhOR*nD*VK{26*`#?h&OM?7@862M7NCR>>3p^r=85p>QL70(Y)*K0-V2r1W zV~E7mUOz{!0|p$Y9g{b%EBXKbO-6Pi&#`B&!jlCa9Pj8}d%BppNlt#<$LAXpIVCl1 z#IG#Btroc8iuKz>KZ(n%3TzQ9(f4=lnk^V$`XFcK>b4i0%Qjv6eo6fOawg%@Wxs$H PGB9|$`njxgN@xNA5pH;= literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/basemetals/textures/ore_overlays/coldiron_ore.png b/src/main/resources/assets/basemetals/textures/ore_overlays/coldiron_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..f94f58ac5118e39e52d631d291f9f175016285da GIT binary patch literal 569 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6XVU3I`u#fOS+@4BLl<6 ze(pbstU$g(vPY0F14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>8+w-DI*hWV)AflV{d?+A{W>6z`#jR z#icDI6s@NRv^vGYVncemITx3vuyBZ;-u%!|X9a~sb8}rTuJuI`^Af!at*inyG~88H z4Mat`xVUaMHQifOZ!ROVzbP$1L*sI7?TYN+DhG!obMp#&`+2dkMqFI!R#vX6s?uCs zrz$F%eSDIQj82x9uZoFD&!1J}=x8V@nPF2@Gq-k|4ie28U-i(tsS!0*}aI1_o|n5N2eU zHAey{=;Z0*7$Pw>IpF|HOvDj`#wI1BqX!mnTxMG;x|7FYQ;dLK%rr)op4&n@3JZc4 vzIwRnM9qws62C-t27GB;W8R^3ESy14g=Nm$c`_4#rZITB`njxgN@xNAz}u+R literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/basemetals/textures/ore_overlays/copper_ore.png b/src/main/resources/assets/basemetals/textures/ore_overlays/copper_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..6ae4ca5151a9d3b214440e37fed6745a8e2591a9 GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6XVU3I`u#fOS+@4BLl<6 ze(pbstU$g(vPY0F14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>b4A@8cIxQl@bD<~h&uGT vWi;G8)V75AWR*#%hRupt4#^bb4@?Y+vJA%>U!VL6G={;`)z4*}Q$iB}a12a^ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/basemetals/textures/ore_overlays/cupronickel_ore.png b/src/main/resources/assets/basemetals/textures/ore_overlays/cupronickel_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..345bcb6d72cd988125cdd64297ea62c9a3c41336 GIT binary patch literal 323 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6XVU3I`u#fOS+@4BLl<6 ze(pbstU$g(vPY0F14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>~Q? zgt*q%*O!!(^!N8?WMu5yFnPzS-mS|!w=VD6vwqV0h0Qxx_ib6)v3u==J?kcJTGFlepdpMUL4Lsu4$p3+0Xdun9+AZi4BWyX%*Zfnjs#FJ%G1R$ zL}F^MpCi`+1D;P4W?b9k^#A|Ojb^Qe6482Yfr38@)w;iG3L1peE@k*|W6OzkVtuZE zXZC4|Sp3!VR#cj?a%ZDQGy*bSj(&+QQ)J L>gTe~DWM4fK(ci1 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/basemetals/textures/ore_overlays/lead_ore.png b/src/main/resources/assets/basemetals/textures/ore_overlays/lead_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..6367761e912809456381fd85b9e49af6b0cc1ec5 GIT binary patch literal 311 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6XVU3I`u#fOS+@4BLl<6 ze(pbstU$g(vPY0F14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>{Zu9WiW@kJ9-D`v#z_a&B2`Tzfa zNsRYSpkBt3AirP+hi5m^fE>;OkH}&M25w;xW@MN(M*=7q?&;zfA~Chs&ynwd0mq|& z6yGoZ@5knpMov?mEzau7P14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>tWf_h&zCQUCXbgj=tDnm{r-UW|1&m49 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/basemetals/textures/ore_overlays/nickel_ore.png b/src/main/resources/assets/basemetals/textures/ore_overlays/nickel_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..a3e7ab527201e88c68263d5cfe35f01951b52ca8 GIT binary patch literal 348 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6XVU3I`u#fOS+@4BLl<6 ze(pbstU$g(vPY0F14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>Eak7F}1fZkgq|3$N4uSpP=KhC;!|{4|wz#UaWgt8f*NZy(c!q=bCSR z>wUX*x9r{sCmXdjDDyx0)Ui8G{9()cZMrF}DpjlsrWVeJ1OA@rtm|Mf5T3C5o0Zc? fE?dp0Z_Buy|1+}*KTqie+Q;DO>gTe~DWM4fE+=pe literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/basemetals/textures/ore_overlays/pewter_ore.png b/src/main/resources/assets/basemetals/textures/ore_overlays/pewter_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..b2d241d965277100a58f862e901e409f7326a578 GIT binary patch literal 323 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6XVU3I`u#fOS+@4BLl<6 ze(pbstU$g(vPY0F14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>~Q? zgt*q%*O!!(^!N8?WMnK_vSQA>#WQBjpE-N}!o|xcO_@1&{^IE~=gnWZbitx!Q>V|K zJ$K=hX|t!zm~(Xh!F;Fm&p<;MOM?7@862M7NCR>>3p^r=85p>QL70(Y)*K0-V3ene zV~E7mUOz{!0|q>wCd|0D$?5<9n;Xqq4JD%W+yVuE6smQ9)f6-csa?wO;l`E|>%{t8 z|IX~w6tVcL=dGwTW9809kH)=u@wZQN>|i&j`c~y&da`8OH@jaf_qZ9~E$LJ^5445B M)78&qol`;+0O14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>~Q? zgt*q%*O!!(^!N8?WMusO|L@bEA8)^Ze)r?ckN^Lke|Yox&(F8tK7IT5=llP^uReeH z`0M+tPw(D*`2^H$)q70=NHLZK`2{mLJiCzwvL>4nJa0`PlBg3pY5*S`Cn?Dxu-xB#@*eSHW_fr~sSIv$;>z+>wowPh7 z`qI32Hjb?;?;3JWZZeHwIO00bq55XMvXm2}Fk44ofvPP)Tsw@SkfJR9T^xl z_H+M9WCijSl0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=d3- zBeIx*fm;}a85w5HkpK#Q_jGX#(U_Pzabe*R0}+?|=Vxdh@HxP`qq#(|fVD+-2UA~l z(`2DbhZ{F&D_%Im%F)4jBx2@NB}?N-rQWjt_xHzd+YtOvqOo`8m*=?|EdmYh2`MRu znXUN+I9cXx&X~cWB9#AAb@dG~x1fbe^RnZ1MjO9i^7_miyg!%6+M16&#(2*xyoeXOjS5_*Ko$1^b$#-0$V8l`Q7Bep06674a$RT=YbrC0T|- zJD&IlOG$?Om%68ynmo&iP3Zc<@O^8Je7U=5-mHasZ#D0q+3q^m+x72~;A=du)Stzl oaSPdaSuOh4PX25Aq94i6Js5L)no8|1U=T2Py85}Sb4q9e0B~@U1poj5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/basemetals/textures/ore_overlays/starsteel_ore.png b/src/main/resources/assets/basemetals/textures/ore_overlays/starsteel_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..2e8267e09f5550daacd9781acb4fb62f79ee64cd GIT binary patch literal 3837 zcmVz@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy32;bRa{vGf6951U69E94oEQKA4rWP2K~#90?VDSVWye*=e^t9K zd+)Q)>F$|n$Br}cB-n|Go#0$BAtAAX;DIE(kq4A;i4-A_$OnLDJ^|M!UJxJ!gm^$8 zkb)uwkbp#xKmt*efb7^~$Fbehm$PqGyB4Z_h9Hk8b8_sNQDWw==|0`1J+*eNs#=%- zS`Bw_2Y2xQ8R~WmeBWa~D}y@ZbD#Z93au!tM`?u;gY>6Nreab9J|)CA^k-+c{T**9 zF5dlCS?w)EqorInVoNUyM3-L5W+ArT7mN{8Inf&7)rNApFPeE_qLmi>=I8vC6_Axt zHubm1c(tLbR$?_`ODD=)U8F+l`e6RKUNw?0L{@|?%UiAheeHlNOEFk69$74!tGl2@ zEB<%4b`xM~F&a^Mw<{#6Goo0OXe5C$8wrcO11et?7fkeM8tlSjjKL(0Q48F{6Am6_ke<*bl0XU( zTYF*}P^LmFgOZznAoNQHY{mNYh+=Xq&K>ZM_x?N=_kNIttEpG}I}1?3Kn%!e(MA!& z2}XNDToXwM1JaF5&;G;wjPn+>nia0K#v*8?D4a$+f3w#8f9vHMgkhXNdq#9W^2Wk) z|2^+wxjbZwad!c>AX!j)M5%1nEg>9%v-q+?sR+ife&I=!D?m@1J0URjkucx7h>rO) zaI>MdJ@DG|hq78;;JM>x=p}M?<#Z>%tSdya-X>3374*Z%a_<7CFFc2G5g9k8-dKgJ z4j9K4l?1JYp_@13hVr~yO5&6WLt!kT?QU+|V6d`SF2q(=ymvcaLgf%+yi|=A>zmma zx@_?kQZ2LFv!d+A;#+TLW0&2eaith$Z@;rSS~N&@AUQW!o!iTfM7%3yQRiI3O1YTtzBH>n zsVggW-OM(|8oPCV!)->nTrdvZyrQA~E+VVQyra6PNbN+|1*~$6p@*Vm+3cfq$>Cnj z8{heJ9AExCk3ar(CN(mK@XBq#&BoNOk(4NOft@4m8>4E@5rV)lViyL9J(z;!@*E3m zsjT9m!vo&`?ho_8{r5oIb9#K4kfYeqa??*hT{;Oxq#UyUu`nr&Q%r?s7)A=M8M+RS zWg;-97u%T-H@}}9U-?cV#JL67gvtgnUZFH4lkQ1fjtC9bd0e46Ja>T)z2iMR{P9n+ zJ~`!|KlN8U-#>}7o+*2UIy+P)7w`KCQswyO*FH^q`rPm-h{!-%NAO@L=tGC|jyOe1yCTJo3(Xp;`GW{&b*lB#KmKZlFOGrL+U!v{_c-{i_6`bAc-&plF_KCAcPZ&qDB>-F?Fw80hPBn z)v~{Lfk*DU#G@bm7`<|Q=|8`UeLQhIWhb9^Ao7i;zP{`97*{fN0qq<{k9ZA(&B4=% zwGMArJotwDdD|yG$(1hf)!+UDKK(a;$d{gbhV}6pr3!56>DD984Req&O~agBUJq*5 z7rc9aC0-Xyao~|l5ApCL_Yt2u<{zKA%$J{hip+M5XB}t6Q;e)6Y3!iBpo@x#9ueq>$zgIHuPyD#F{w!8Z2Cr% zt6de4iIG*^po@uRQ&UJuKTUMulxb3=lxc&3a2C+U&HRF{6sZ%Gv&fjk%I_Zg2Nxuy zNK}e4O+5OJALqUweGgyx+t2Xi(_i7ZKSE&{#=s;UUVDb_lt~=ZIFKXpo2q~cC;I$3 zWPE(1(HT$pXt8u9`&M<5EIjwsFwvYOsE3-Y$r;KDJpc~8TuoNvSMue zIe+Q8qfOWuc9VD8QSa}4n*nylifKx*rIvbsDee|%b#{;c$Ab*-|`b+t{u=m z3r#r$qlhE6aS$zje~;6nXVFT}M8%K-wkk0sx^Bdkes*~=zS!va+RK=;K9ys0j~xW< zYqB9t(>e!?6iH#~hR~jEG>{D|1x4lo>7tQai7VRpu z3}~}JPix-v@Ou~x{P!0=$JzSEB&oi3K=h_6hO`v<812QN}vLNk6mQih}m^Y+k%66@7O~90pw7kPAmaCqgTX-FgmXr!dSB5%U|U5%I>)c^>Qhu z(qc>{-XqFt$x^IsqK@?GKp5FzT3O7ZbXj2uNY)*+Swp4^H^L8shX^k)IS-7(cY~e88Zj97; zM(q~3a*w_bjIl$x1!Es636%DwjLSACmC$Z)t`uWIijr;^&|@AM4vZ$n zL`vi4m`==rO<}(OH(zgipe`&6yT~*j67^ij%ms&B*vMt5JGchc87Y^w)O(FMn@irz zS4Fw}Rf?;$__7jHT}^&+S-W=PeJv*U(d>xIX?f?HAC*77Jj(C<^_S#F-v2SV^rjyc zYmAh3yIVHgWT?yt4~ZeRl&&V32BSt~9EqtXX^r-F=IN{bis?$1%O{9_c`i@cip$Sm z=Fflm*I3ksqo@CcD@V_v{KT*>w*P-_GV)EyYG3Z}GxY> zb3dT>RZe3?ncUi9#pg=qrm^vcsH+tik2V`ZerPjA9cH@R7ItQhDa_moH+MngSIDQK z8Yx$fs&R9k;i^h%m>KJP=Fe-p(2syjIhYvCqqE& zh^5{-;n1!zDljEKdydjOOwK<2A8R~>;SErOIexYKlB$lzjyD3mD+-z`S36DiQoHu-u&JV;HunQH|Wbz$d0Ffq@=Vy16+)n-Z0`R5Xf2->+YpC-GWzCQUNiV>idYbWrF8 zAti<#`~K>^yQFK6ICtTY)90UM9B*8S($@~eUem3gC!}NI$-t;1s>oDTKewV7We90x z98Q_i_Aah%aJk_pfL(x^Pm7~#nLS4cyU#Cuq^dmY=W@YxJFRZ69q_edT2Gj&WU>=R z*R!=Q_g}-fewudO&(GP)XKnFHp-q7ji}Wf-k&Ht-?@HIMXJT|$h;13pa=?{s%=W*y z(AN%RmlbOvrFJGj!gPgk7#UBV0@Z9Rd+7;%E=0caFrr_# zexdLCnbps2G$wD-9o)ek+`%2(!5!QI*T??=4|Sn}*qttp00000NkvXXu0mjfRK#YY literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/basemetals/textures/ore_overlays/tin_ore.png b/src/main/resources/assets/basemetals/textures/ore_overlays/tin_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..03d13a75b7ba327fee9bea2e5272abe342b191c8 GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6XVU3I`u#fOS+@4BLl<6 ze(pbstU$g(vPY0F14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>aimk{;f=`KMY%suIt^ngZHX^%;R;* z2k)Nt2t2=JxwYEH=0|gvNwWqkG1xiyIPKMoJ>4eYAa&t$;DraK2Sc`fi~Gg$`45xY U?#Yh&KzkTGUHx3vIVCg!01y{>D*ylh literal 0 HcmV?d00001 From 41d935d813c8c7b4e9a8a338405490ed29f9870d Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Sun, 4 Oct 2026 12:32:58 +0100 Subject: [PATCH 4/4] Add ore overlays, config screens and 1.12-style recipe discovery Use Kiri's ore overlays with vanilla host textures, bring High and Low Fantasy settings to 1.13, and unlock crafting recipes when players find a material. Keep old saves and recipe progress intact, with packaged client/server and separate Cyano, MMD 1.10 and MMD 1.12 upgrade tests. --- .gitattributes | 1 + .github/workflows/ci.yml | 2 +- CHANGELOG.txt | 26 +- README.md | 79 ++- build.gradle | 79 ++- docs/COMPATIBILITY.md | 22 +- docs/CONTENT_MODES.md | 83 +++ docs/MIGRATION.md | 14 +- docs/VERSIONS.md | 3 +- docs/WORLDGEN.md | 8 +- gradle.properties | 58 +-- .../testmod/BaseMetalsClientProbe.java | 202 +++++++- .../assets/basemetals/lang/de_de.json | 59 ++- .../assets/basemetals/lang/en_au.json | 59 ++- .../assets/basemetals/lang/en_ca.json | 59 ++- .../assets/basemetals/lang/en_en.json | 59 ++- .../assets/basemetals/lang/en_gb.json | 59 ++- .../assets/basemetals/lang/en_pt.json | 95 ++-- .../assets/basemetals/lang/en_us.json | 75 ++- .../assets/basemetals/lang/es_es.json | 59 ++- .../assets/basemetals/lang/es_mx.json | 59 ++- .../assets/basemetals/lang/fr_ca.json | 221 ++++---- .../assets/basemetals/lang/fr_fr.json | 221 ++++---- .../assets/basemetals/lang/it_it.json | 67 ++- .../assets/basemetals/lang/ja_jp.json | 57 ++- .../assets/basemetals/lang/nl_nl.json | 59 ++- .../assets/basemetals/lang/pt_br.json | 59 ++- .../assets/basemetals/lang/ru_ru.json | 63 ++- .../assets/basemetals/lang/zh_cn.json | 59 ++- .../assets/basemetals/lang/zh_tw.json | 69 ++- .../advancements/recipes/activator_rail.json | 11 + .../recipes/adamantine_anvil.json | 11 + .../recipes/adamantine_arrow.json | 11 + .../advancements/recipes/adamantine_axe.json | 11 + .../advancements/recipes/adamantine_bars.json | 11 + .../recipes/adamantine_bars_2.json | 11 + .../recipes/adamantine_block.json | 11 + .../recipes/adamantine_block_ingot.json | 11 + .../advancements/recipes/adamantine_bolt.json | 11 + .../recipes/adamantine_boots.json | 11 + .../advancements/recipes/adamantine_bow.json | 11 + .../recipes/adamantine_button.json | 11 + .../recipes/adamantine_chestplate.json | 11 + .../recipes/adamantine_crackhammer.json | 11 + .../recipes/adamantine_crossbow.json | 11 + .../advancements/recipes/adamantine_door.json | 11 + .../recipes/adamantine_fishingrod.json | 11 + .../advancements/recipes/adamantine_gear.json | 11 + .../recipes/adamantine_helmet.json | 11 + .../advancements/recipes/adamantine_hoe.json | 11 + .../recipes/adamantine_horsearmor.json | 11 + .../adamantine_ingot_from_nuggets.json | 11 + .../recipes/adamantine_leggings.json | 11 + .../recipes/adamantine_lever.json | 11 + .../recipes/adamantine_nuggets.json | 11 + .../recipes/adamantine_pickaxe.json | 11 + .../recipes/adamantine_plate.json | 11 + .../recipes/adamantine_powder_from_small.json | 11 + .../recipes/adamantine_pressure_plate.json | 11 + .../advancements/recipes/adamantine_rod.json | 11 + .../recipes/adamantine_scythe.json | 11 + .../recipes/adamantine_shears.json | 11 + .../recipes/adamantine_shield.json | 11 + .../recipes/adamantine_shovel.json | 11 + .../advancements/recipes/adamantine_slab.json | 11 + .../recipes/adamantine_smallpowder.json | 11 + .../recipes/adamantine_stairs.json | 11 + .../recipes/adamantine_sword.json | 11 + .../recipes/adamantine_trapdoor.json | 11 + .../advancements/recipes/adamantine_wall.json | 11 + .../advancements/recipes/antimony_arrow.json | 11 + .../advancements/recipes/antimony_axe.json | 11 + .../advancements/recipes/antimony_bars.json | 11 + .../advancements/recipes/antimony_bars_2.json | 11 + .../advancements/recipes/antimony_block.json | 11 + .../recipes/antimony_block_ingot.json | 11 + .../advancements/recipes/antimony_bolt.json | 11 + .../advancements/recipes/antimony_boots.json | 11 + .../advancements/recipes/antimony_bow.json | 11 + .../advancements/recipes/antimony_button.json | 11 + .../recipes/antimony_chestplate.json | 11 + .../recipes/antimony_crackhammer.json | 11 + .../recipes/antimony_crossbow.json | 11 + .../advancements/recipes/antimony_door.json | 11 + .../recipes/antimony_fishingrod.json | 11 + .../advancements/recipes/antimony_gear.json | 11 + .../advancements/recipes/antimony_helmet.json | 11 + .../advancements/recipes/antimony_hoe.json | 11 + .../recipes/antimony_horsearmor.json | 11 + .../recipes/antimony_ingot_from_nuggets.json | 11 + .../recipes/antimony_leggings.json | 11 + .../advancements/recipes/antimony_lever.json | 11 + .../recipes/antimony_nuggets.json | 11 + .../recipes/antimony_pickaxe.json | 11 + .../advancements/recipes/antimony_plate.json | 11 + .../recipes/antimony_powder_from_small.json | 11 + .../recipes/antimony_pressure_plate.json | 11 + .../advancements/recipes/antimony_rod.json | 11 + .../advancements/recipes/antimony_scythe.json | 11 + .../advancements/recipes/antimony_shears.json | 11 + .../advancements/recipes/antimony_shield.json | 11 + .../advancements/recipes/antimony_shovel.json | 11 + .../advancements/recipes/antimony_slab.json | 11 + .../recipes/antimony_smallpowder.json | 11 + .../advancements/recipes/antimony_stairs.json | 11 + .../advancements/recipes/antimony_sword.json | 11 + .../recipes/antimony_trapdoor.json | 11 + .../advancements/recipes/antimony_wall.json | 11 + .../advancements/recipes/aquarium_arrow.json | 11 + .../advancements/recipes/aquarium_axe.json | 11 + .../advancements/recipes/aquarium_bars.json | 11 + .../advancements/recipes/aquarium_bars_2.json | 11 + .../advancements/recipes/aquarium_blend.json | 11 + .../recipes/aquarium_blend_from_small.json | 11 + .../advancements/recipes/aquarium_block.json | 11 + .../recipes/aquarium_block_ingot.json | 11 + .../advancements/recipes/aquarium_bolt.json | 11 + .../advancements/recipes/aquarium_boots.json | 11 + .../advancements/recipes/aquarium_bow.json | 11 + .../advancements/recipes/aquarium_button.json | 11 + .../recipes/aquarium_chestplate.json | 11 + .../recipes/aquarium_crackhammer.json | 11 + .../recipes/aquarium_crossbow.json | 11 + .../advancements/recipes/aquarium_door.json | 11 + .../recipes/aquarium_fishingrod.json | 11 + .../advancements/recipes/aquarium_gear.json | 11 + .../advancements/recipes/aquarium_helmet.json | 11 + .../advancements/recipes/aquarium_hoe.json | 11 + .../recipes/aquarium_horsearmor.json | 11 + .../recipes/aquarium_ingot_from_nuggets.json | 11 + .../recipes/aquarium_leggings.json | 11 + .../advancements/recipes/aquarium_lever.json | 11 + .../recipes/aquarium_nuggets.json | 11 + .../recipes/aquarium_pickaxe.json | 11 + .../advancements/recipes/aquarium_plate.json | 11 + .../recipes/aquarium_powder_from_small.json | 11 + .../recipes/aquarium_pressure_plate.json | 11 + .../advancements/recipes/aquarium_rod.json | 11 + .../advancements/recipes/aquarium_scythe.json | 11 + .../advancements/recipes/aquarium_shears.json | 11 + .../advancements/recipes/aquarium_shield.json | 11 + .../advancements/recipes/aquarium_shovel.json | 11 + .../advancements/recipes/aquarium_slab.json | 11 + .../recipes/aquarium_smallblend.json | 11 + .../recipes/aquarium_smallpowder.json | 11 + .../advancements/recipes/aquarium_stairs.json | 11 + .../advancements/recipes/aquarium_sword.json | 11 + .../recipes/aquarium_trapdoor.json | 11 + .../advancements/recipes/aquarium_wall.json | 11 + .../advancements/recipes/bismuth_arrow.json | 11 + .../advancements/recipes/bismuth_axe.json | 11 + .../advancements/recipes/bismuth_bars.json | 11 + .../advancements/recipes/bismuth_bars_2.json | 11 + .../advancements/recipes/bismuth_block.json | 11 + .../recipes/bismuth_block_ingot.json | 11 + .../advancements/recipes/bismuth_bolt.json | 11 + .../advancements/recipes/bismuth_boots.json | 11 + .../advancements/recipes/bismuth_bow.json | 11 + .../advancements/recipes/bismuth_button.json | 11 + .../recipes/bismuth_chestplate.json | 11 + .../recipes/bismuth_crackhammer.json | 11 + .../recipes/bismuth_crossbow.json | 11 + .../advancements/recipes/bismuth_door.json | 11 + .../recipes/bismuth_fishingrod.json | 11 + .../advancements/recipes/bismuth_gear.json | 11 + .../advancements/recipes/bismuth_helmet.json | 11 + .../advancements/recipes/bismuth_hoe.json | 11 + .../recipes/bismuth_horsearmor.json | 11 + .../recipes/bismuth_ingot_from_nuggets.json | 11 + .../recipes/bismuth_leggings.json | 11 + .../advancements/recipes/bismuth_lever.json | 11 + .../advancements/recipes/bismuth_nuggets.json | 11 + .../advancements/recipes/bismuth_pickaxe.json | 11 + .../advancements/recipes/bismuth_plate.json | 11 + .../recipes/bismuth_powder_from_small.json | 11 + .../recipes/bismuth_pressure_plate.json | 11 + .../advancements/recipes/bismuth_rod.json | 11 + .../advancements/recipes/bismuth_scythe.json | 11 + .../advancements/recipes/bismuth_shears.json | 11 + .../advancements/recipes/bismuth_shield.json | 11 + .../advancements/recipes/bismuth_shovel.json | 11 + .../advancements/recipes/bismuth_slab.json | 11 + .../recipes/bismuth_smallpowder.json | 11 + .../advancements/recipes/bismuth_stairs.json | 11 + .../advancements/recipes/bismuth_sword.json | 11 + .../recipes/bismuth_trapdoor.json | 11 + .../advancements/recipes/bismuth_wall.json | 11 + .../advancements/recipes/brass_arrow.json | 11 + .../advancements/recipes/brass_axe.json | 11 + .../advancements/recipes/brass_bars.json | 11 + .../advancements/recipes/brass_bars_2.json | 11 + .../advancements/recipes/brass_blend.json | 11 + .../recipes/brass_blend_from_small.json | 11 + .../advancements/recipes/brass_block.json | 11 + .../recipes/brass_block_ingot.json | 11 + .../advancements/recipes/brass_bolt.json | 11 + .../advancements/recipes/brass_boots.json | 11 + .../advancements/recipes/brass_bow.json | 11 + .../advancements/recipes/brass_button.json | 11 + .../recipes/brass_chestplate.json | 11 + .../recipes/brass_crackhammer.json | 11 + .../advancements/recipes/brass_crossbow.json | 11 + .../advancements/recipes/brass_door.json | 11 + .../recipes/brass_fishingrod.json | 11 + .../advancements/recipes/brass_gear.json | 11 + .../advancements/recipes/brass_helmet.json | 11 + .../advancements/recipes/brass_hoe.json | 11 + .../recipes/brass_horsearmor.json | 11 + .../recipes/brass_ingot_from_nuggets.json | 11 + .../advancements/recipes/brass_leggings.json | 11 + .../advancements/recipes/brass_lever.json | 11 + .../advancements/recipes/brass_nuggets.json | 11 + .../advancements/recipes/brass_pickaxe.json | 11 + .../advancements/recipes/brass_plate.json | 11 + .../recipes/brass_powder_from_small.json | 11 + .../recipes/brass_pressure_plate.json | 11 + .../advancements/recipes/brass_rod.json | 11 + .../advancements/recipes/brass_scythe.json | 11 + .../advancements/recipes/brass_shears.json | 11 + .../advancements/recipes/brass_shield.json | 11 + .../advancements/recipes/brass_shovel.json | 11 + .../advancements/recipes/brass_slab.json | 11 + .../recipes/brass_smallblend.json | 11 + .../recipes/brass_smallpowder.json | 11 + .../advancements/recipes/brass_stairs.json | 11 + .../advancements/recipes/brass_sword.json | 11 + .../advancements/recipes/brass_trapdoor.json | 11 + .../advancements/recipes/brass_wall.json | 11 + .../advancements/recipes/bronze_arrow.json | 11 + .../advancements/recipes/bronze_axe.json | 11 + .../advancements/recipes/bronze_bars.json | 11 + .../advancements/recipes/bronze_bars_2.json | 11 + .../advancements/recipes/bronze_blend.json | 11 + .../recipes/bronze_blend_from_small.json | 11 + .../advancements/recipes/bronze_block.json | 11 + .../recipes/bronze_block_ingot.json | 11 + .../advancements/recipes/bronze_bolt.json | 11 + .../advancements/recipes/bronze_boots.json | 11 + .../advancements/recipes/bronze_bow.json | 11 + .../advancements/recipes/bronze_button.json | 11 + .../recipes/bronze_chestplate.json | 11 + .../recipes/bronze_crackhammer.json | 11 + .../advancements/recipes/bronze_crossbow.json | 11 + .../advancements/recipes/bronze_door.json | 11 + .../recipes/bronze_fishingrod.json | 11 + .../advancements/recipes/bronze_gear.json | 11 + .../advancements/recipes/bronze_helmet.json | 11 + .../advancements/recipes/bronze_hoe.json | 11 + .../recipes/bronze_horsearmor.json | 11 + .../recipes/bronze_ingot_from_nuggets.json | 11 + .../advancements/recipes/bronze_leggings.json | 11 + .../advancements/recipes/bronze_lever.json | 11 + .../advancements/recipes/bronze_nuggets.json | 11 + .../advancements/recipes/bronze_pickaxe.json | 11 + .../advancements/recipes/bronze_plate.json | 11 + .../recipes/bronze_powder_from_small.json | 11 + .../recipes/bronze_pressure_plate.json | 11 + .../advancements/recipes/bronze_rod.json | 11 + .../advancements/recipes/bronze_scythe.json | 11 + .../advancements/recipes/bronze_shears.json | 11 + .../advancements/recipes/bronze_shield.json | 11 + .../advancements/recipes/bronze_shovel.json | 11 + .../advancements/recipes/bronze_slab.json | 11 + .../recipes/bronze_smallblend.json | 11 + .../recipes/bronze_smallpowder.json | 11 + .../advancements/recipes/bronze_stairs.json | 11 + .../advancements/recipes/bronze_sword.json | 11 + .../advancements/recipes/bronze_trapdoor.json | 11 + .../advancements/recipes/bronze_wall.json | 11 + .../advancements/recipes/charcoal_block.json | 11 + .../recipes/charcoal_block_dust.json | 11 + .../advancements/recipes/charcoal_ingot.json | 11 + .../advancements/recipes/charcoal_nugget.json | 11 + .../recipes/charcoal_powder_from_small.json | 11 + .../recipes/charcoal_smallpowder.json | 11 + .../advancements/recipes/coal_block_dust.json | 11 + .../advancements/recipes/coal_ingot.json | 11 + .../advancements/recipes/coal_nugget.json | 11 + .../recipes/coal_powder_from_small.json | 11 + .../recipes/coal_smallpowder.json | 11 + .../advancements/recipes/coldiron_arrow.json | 11 + .../advancements/recipes/coldiron_axe.json | 11 + .../advancements/recipes/coldiron_bars.json | 11 + .../advancements/recipes/coldiron_bars_2.json | 11 + .../advancements/recipes/coldiron_block.json | 11 + .../recipes/coldiron_block_ingot.json | 11 + .../advancements/recipes/coldiron_bolt.json | 11 + .../advancements/recipes/coldiron_boots.json | 11 + .../advancements/recipes/coldiron_bow.json | 11 + .../advancements/recipes/coldiron_button.json | 11 + .../recipes/coldiron_chestplate.json | 11 + .../recipes/coldiron_crackhammer.json | 11 + .../recipes/coldiron_crossbow.json | 11 + .../advancements/recipes/coldiron_door.json | 11 + .../recipes/coldiron_fishingrod.json | 11 + .../advancements/recipes/coldiron_gear.json | 11 + .../advancements/recipes/coldiron_helmet.json | 11 + .../advancements/recipes/coldiron_hoe.json | 11 + .../recipes/coldiron_horsearmor.json | 11 + .../recipes/coldiron_ingot_from_nuggets.json | 11 + .../recipes/coldiron_leggings.json | 11 + .../advancements/recipes/coldiron_lever.json | 11 + .../recipes/coldiron_nuggets.json | 11 + .../recipes/coldiron_pickaxe.json | 11 + .../advancements/recipes/coldiron_plate.json | 11 + .../recipes/coldiron_powder_from_small.json | 11 + .../recipes/coldiron_pressure_plate.json | 11 + .../advancements/recipes/coldiron_rod.json | 11 + .../advancements/recipes/coldiron_scythe.json | 11 + .../advancements/recipes/coldiron_shears.json | 11 + .../advancements/recipes/coldiron_shield.json | 11 + .../advancements/recipes/coldiron_shovel.json | 11 + .../advancements/recipes/coldiron_slab.json | 11 + .../recipes/coldiron_smallpowder.json | 11 + .../advancements/recipes/coldiron_stairs.json | 11 + .../advancements/recipes/coldiron_sword.json | 11 + .../recipes/coldiron_trapdoor.json | 11 + .../advancements/recipes/coldiron_wall.json | 11 + .../advancements/recipes/copper_arrow.json | 11 + .../advancements/recipes/copper_axe.json | 11 + .../advancements/recipes/copper_bars.json | 11 + .../advancements/recipes/copper_bars_2.json | 11 + .../advancements/recipes/copper_block.json | 11 + .../recipes/copper_block_ingot.json | 11 + .../advancements/recipes/copper_bolt.json | 11 + .../advancements/recipes/copper_boots.json | 11 + .../advancements/recipes/copper_bow.json | 11 + .../advancements/recipes/copper_button.json | 11 + .../recipes/copper_chestplate.json | 11 + .../recipes/copper_crackhammer.json | 11 + .../advancements/recipes/copper_crossbow.json | 11 + .../advancements/recipes/copper_door.json | 11 + .../recipes/copper_fishingrod.json | 11 + .../advancements/recipes/copper_gear.json | 11 + .../advancements/recipes/copper_helmet.json | 11 + .../advancements/recipes/copper_hoe.json | 11 + .../recipes/copper_horsearmor.json | 11 + .../recipes/copper_ingot_from_nuggets.json | 11 + .../advancements/recipes/copper_leggings.json | 11 + .../advancements/recipes/copper_lever.json | 11 + .../advancements/recipes/copper_nuggets.json | 11 + .../advancements/recipes/copper_pickaxe.json | 11 + .../advancements/recipes/copper_plate.json | 11 + .../recipes/copper_powder_from_small.json | 11 + .../recipes/copper_pressure_plate.json | 11 + .../advancements/recipes/copper_rod.json | 11 + .../advancements/recipes/copper_scythe.json | 11 + .../advancements/recipes/copper_shears.json | 11 + .../advancements/recipes/copper_shield.json | 11 + .../advancements/recipes/copper_shovel.json | 11 + .../advancements/recipes/copper_slab.json | 11 + .../recipes/copper_smallpowder.json | 11 + .../advancements/recipes/copper_stairs.json | 11 + .../advancements/recipes/copper_sword.json | 11 + .../advancements/recipes/copper_trapdoor.json | 11 + .../advancements/recipes/copper_wall.json | 11 + .../recipes/cupronickel_arrow.json | 11 + .../advancements/recipes/cupronickel_axe.json | 11 + .../recipes/cupronickel_bars.json | 11 + .../recipes/cupronickel_bars_2.json | 11 + .../recipes/cupronickel_blend.json | 11 + .../recipes/cupronickel_blend_from_small.json | 11 + .../recipes/cupronickel_block.json | 11 + .../recipes/cupronickel_block_ingot.json | 11 + .../recipes/cupronickel_bolt.json | 11 + .../recipes/cupronickel_boots.json | 11 + .../advancements/recipes/cupronickel_bow.json | 11 + .../recipes/cupronickel_button.json | 11 + .../recipes/cupronickel_chestplate.json | 11 + .../recipes/cupronickel_crackhammer.json | 11 + .../recipes/cupronickel_crossbow.json | 11 + .../recipes/cupronickel_door.json | 11 + .../recipes/cupronickel_fishingrod.json | 11 + .../recipes/cupronickel_gear.json | 11 + .../recipes/cupronickel_helmet.json | 11 + .../advancements/recipes/cupronickel_hoe.json | 11 + .../recipes/cupronickel_horsearmor.json | 11 + .../cupronickel_ingot_from_nuggets.json | 11 + .../recipes/cupronickel_leggings.json | 11 + .../recipes/cupronickel_lever.json | 11 + .../recipes/cupronickel_nuggets.json | 11 + .../recipes/cupronickel_pickaxe.json | 11 + .../recipes/cupronickel_plate.json | 11 + .../cupronickel_powder_from_small.json | 11 + .../recipes/cupronickel_pressure_plate.json | 11 + .../advancements/recipes/cupronickel_rod.json | 11 + .../recipes/cupronickel_scythe.json | 11 + .../recipes/cupronickel_shears.json | 11 + .../recipes/cupronickel_shield.json | 11 + .../recipes/cupronickel_shovel.json | 11 + .../recipes/cupronickel_slab.json | 11 + .../recipes/cupronickel_smallblend.json | 11 + .../recipes/cupronickel_smallpowder.json | 11 + .../recipes/cupronickel_stairs.json | 11 + .../recipes/cupronickel_sword.json | 11 + .../recipes/cupronickel_trapdoor.json | 11 + .../recipes/cupronickel_wall.json | 11 + .../advancements/recipes/detector_rail.json | 11 + .../advancements/recipes/diamond_arrow.json | 11 + .../advancements/recipes/diamond_bars.json | 11 + .../advancements/recipes/diamond_bars_2.json | 11 + .../advancements/recipes/diamond_bolt.json | 11 + .../advancements/recipes/diamond_bow.json | 11 + .../advancements/recipes/diamond_button.json | 11 + .../recipes/diamond_crackhammer.json | 11 + .../recipes/diamond_crossbow.json | 11 + .../advancements/recipes/diamond_door.json | 11 + .../recipes/diamond_fishingrod.json | 11 + .../advancements/recipes/diamond_gear.json | 11 + .../advancements/recipes/diamond_lever.json | 11 + .../recipes/diamond_powder_from_small.json | 11 + .../recipes/diamond_pressure_plate.json | 11 + .../advancements/recipes/diamond_rod.json | 11 + .../advancements/recipes/diamond_scythe.json | 11 + .../advancements/recipes/diamond_shears.json | 11 + .../advancements/recipes/diamond_shield.json | 11 + .../advancements/recipes/diamond_slab.json | 11 + .../recipes/diamond_smallpowder.json | 11 + .../advancements/recipes/diamond_stairs.json | 11 + .../recipes/diamond_trapdoor.json | 11 + .../advancements/recipes/diamond_wall.json | 11 + .../advancements/recipes/electrum_arrow.json | 11 + .../advancements/recipes/electrum_axe.json | 11 + .../advancements/recipes/electrum_bars.json | 11 + .../advancements/recipes/electrum_bars_2.json | 11 + .../advancements/recipes/electrum_blend.json | 11 + .../recipes/electrum_blend_from_small.json | 11 + .../advancements/recipes/electrum_block.json | 11 + .../recipes/electrum_block_ingot.json | 11 + .../advancements/recipes/electrum_bolt.json | 11 + .../advancements/recipes/electrum_boots.json | 11 + .../advancements/recipes/electrum_bow.json | 11 + .../advancements/recipes/electrum_button.json | 11 + .../recipes/electrum_chestplate.json | 11 + .../recipes/electrum_crackhammer.json | 11 + .../recipes/electrum_crossbow.json | 11 + .../advancements/recipes/electrum_door.json | 11 + .../recipes/electrum_fishingrod.json | 11 + .../advancements/recipes/electrum_gear.json | 11 + .../advancements/recipes/electrum_helmet.json | 11 + .../advancements/recipes/electrum_hoe.json | 11 + .../recipes/electrum_horsearmor.json | 11 + .../recipes/electrum_ingot_from_nuggets.json | 11 + .../recipes/electrum_leggings.json | 11 + .../advancements/recipes/electrum_lever.json | 11 + .../recipes/electrum_nuggets.json | 11 + .../recipes/electrum_pickaxe.json | 11 + .../advancements/recipes/electrum_plate.json | 11 + .../recipes/electrum_powder_from_small.json | 11 + .../recipes/electrum_pressure_plate.json | 11 + .../advancements/recipes/electrum_rod.json | 11 + .../advancements/recipes/electrum_scythe.json | 11 + .../advancements/recipes/electrum_shears.json | 11 + .../advancements/recipes/electrum_shield.json | 11 + .../advancements/recipes/electrum_shovel.json | 11 + .../advancements/recipes/electrum_slab.json | 11 + .../recipes/electrum_smallblend.json | 11 + .../recipes/electrum_smallpowder.json | 11 + .../advancements/recipes/electrum_stairs.json | 11 + .../advancements/recipes/electrum_sword.json | 11 + .../recipes/electrum_trapdoor.json | 11 + .../advancements/recipes/electrum_wall.json | 11 + .../advancements/recipes/emerald_arrow.json | 11 + .../advancements/recipes/emerald_axe.json | 11 + .../advancements/recipes/emerald_bars.json | 11 + .../advancements/recipes/emerald_bars_2.json | 11 + .../advancements/recipes/emerald_bolt.json | 11 + .../advancements/recipes/emerald_boots.json | 11 + .../advancements/recipes/emerald_bow.json | 11 + .../advancements/recipes/emerald_button.json | 11 + .../recipes/emerald_chestplate.json | 11 + .../recipes/emerald_crackhammer.json | 11 + .../recipes/emerald_crossbow.json | 11 + .../advancements/recipes/emerald_door.json | 11 + .../recipes/emerald_fishingrod.json | 11 + .../advancements/recipes/emerald_gear.json | 11 + .../advancements/recipes/emerald_helmet.json | 11 + .../advancements/recipes/emerald_hoe.json | 11 + .../recipes/emerald_horsearmor.json | 11 + .../recipes/emerald_leggings.json | 11 + .../advancements/recipes/emerald_lever.json | 11 + .../advancements/recipes/emerald_pickaxe.json | 11 + .../recipes/emerald_powder_from_small.json | 11 + .../recipes/emerald_pressure_plate.json | 11 + .../advancements/recipes/emerald_rod.json | 11 + .../advancements/recipes/emerald_scythe.json | 11 + .../advancements/recipes/emerald_shears.json | 11 + .../advancements/recipes/emerald_shield.json | 11 + .../advancements/recipes/emerald_shovel.json | 11 + .../advancements/recipes/emerald_slab.json | 11 + .../recipes/emerald_smallpowder.json | 11 + .../advancements/recipes/emerald_stairs.json | 11 + .../advancements/recipes/emerald_sword.json | 11 + .../recipes/emerald_trapdoor.json | 11 + .../advancements/recipes/emerald_wall.json | 11 + .../advancements/recipes/flint_and_steel.json | 11 + .../advancements/recipes/gold_arrow.json | 11 + .../advancements/recipes/gold_bars.json | 11 + .../advancements/recipes/gold_bars_2.json | 11 + .../advancements/recipes/gold_bolt.json | 11 + .../advancements/recipes/gold_bow.json | 11 + .../advancements/recipes/gold_button.json | 11 + .../recipes/gold_crackhammer.json | 11 + .../advancements/recipes/gold_crossbow.json | 11 + .../advancements/recipes/gold_door.json | 11 + .../advancements/recipes/gold_fishingrod.json | 11 + .../advancements/recipes/gold_gear.json | 11 + .../advancements/recipes/gold_lever.json | 11 + .../advancements/recipes/gold_plate.json | 11 + .../recipes/gold_powder_from_small.json | 11 + .../advancements/recipes/gold_rod.json | 11 + .../advancements/recipes/gold_scythe.json | 11 + .../advancements/recipes/gold_shears.json | 11 + .../advancements/recipes/gold_shield.json | 11 + .../advancements/recipes/gold_slab.json | 11 + .../recipes/gold_smallpowder.json | 11 + .../advancements/recipes/gold_stairs.json | 11 + .../advancements/recipes/gold_trapdoor.json | 11 + .../advancements/recipes/gold_wall.json | 11 + .../advancements/recipes/human_detector.json | 11 + .../advancements/recipes/invar_arrow.json | 11 + .../advancements/recipes/invar_axe.json | 11 + .../advancements/recipes/invar_bars.json | 11 + .../advancements/recipes/invar_bars_2.json | 11 + .../advancements/recipes/invar_blend.json | 11 + .../recipes/invar_blend_from_small.json | 11 + .../advancements/recipes/invar_block.json | 11 + .../recipes/invar_block_ingot.json | 11 + .../advancements/recipes/invar_bolt.json | 11 + .../advancements/recipes/invar_boots.json | 11 + .../advancements/recipes/invar_bow.json | 11 + .../advancements/recipes/invar_button.json | 11 + .../recipes/invar_chestplate.json | 11 + .../recipes/invar_crackhammer.json | 11 + .../advancements/recipes/invar_crossbow.json | 11 + .../advancements/recipes/invar_door.json | 11 + .../recipes/invar_fishingrod.json | 11 + .../advancements/recipes/invar_gear.json | 11 + .../advancements/recipes/invar_helmet.json | 11 + .../advancements/recipes/invar_hoe.json | 11 + .../recipes/invar_horsearmor.json | 11 + .../recipes/invar_ingot_from_nuggets.json | 11 + .../advancements/recipes/invar_leggings.json | 11 + .../advancements/recipes/invar_lever.json | 11 + .../advancements/recipes/invar_nuggets.json | 11 + .../advancements/recipes/invar_pickaxe.json | 11 + .../advancements/recipes/invar_plate.json | 11 + .../recipes/invar_powder_from_small.json | 11 + .../recipes/invar_pressure_plate.json | 11 + .../advancements/recipes/invar_rod.json | 11 + .../advancements/recipes/invar_scythe.json | 11 + .../advancements/recipes/invar_shears.json | 11 + .../advancements/recipes/invar_shield.json | 11 + .../advancements/recipes/invar_shovel.json | 11 + .../advancements/recipes/invar_slab.json | 11 + .../recipes/invar_smallblend.json | 11 + .../recipes/invar_smallpowder.json | 11 + .../advancements/recipes/invar_stairs.json | 11 + .../advancements/recipes/invar_sword.json | 11 + .../advancements/recipes/invar_trapdoor.json | 11 + .../advancements/recipes/invar_wall.json | 11 + .../advancements/recipes/iron_arrow.json | 11 + .../advancements/recipes/iron_bars_2.json | 11 + .../advancements/recipes/iron_bolt.json | 11 + .../advancements/recipes/iron_bow.json | 11 + .../advancements/recipes/iron_button.json | 11 + .../recipes/iron_crackhammer.json | 11 + .../advancements/recipes/iron_crossbow.json | 11 + .../advancements/recipes/iron_fishingrod.json | 11 + .../advancements/recipes/iron_gear.json | 11 + .../advancements/recipes/iron_lever.json | 11 + .../advancements/recipes/iron_plate.json | 11 + .../recipes/iron_powder_from_small.json | 11 + .../advancements/recipes/iron_rod.json | 11 + .../advancements/recipes/iron_scythe.json | 11 + .../advancements/recipes/iron_shield.json | 11 + .../advancements/recipes/iron_slab.json | 11 + .../recipes/iron_smallpowder.json | 11 + .../advancements/recipes/iron_stairs.json | 11 + .../advancements/recipes/iron_wall.json | 11 + .../advancements/recipes/lead_arrow.json | 11 + .../advancements/recipes/lead_axe.json | 11 + .../advancements/recipes/lead_bars.json | 11 + .../advancements/recipes/lead_bars_2.json | 11 + .../advancements/recipes/lead_block.json | 11 + .../recipes/lead_block_ingot.json | 11 + .../advancements/recipes/lead_bolt.json | 11 + .../advancements/recipes/lead_boots.json | 11 + .../advancements/recipes/lead_bow.json | 11 + .../advancements/recipes/lead_button.json | 11 + .../advancements/recipes/lead_chestplate.json | 11 + .../recipes/lead_crackhammer.json | 11 + .../advancements/recipes/lead_crossbow.json | 11 + .../advancements/recipes/lead_door.json | 11 + .../advancements/recipes/lead_fishingrod.json | 11 + .../advancements/recipes/lead_gear.json | 11 + .../advancements/recipes/lead_helmet.json | 11 + .../advancements/recipes/lead_hoe.json | 11 + .../advancements/recipes/lead_horsearmor.json | 11 + .../recipes/lead_ingot_from_nuggets.json | 11 + .../advancements/recipes/lead_leggings.json | 11 + .../advancements/recipes/lead_lever.json | 11 + .../advancements/recipes/lead_nuggets.json | 11 + .../advancements/recipes/lead_pickaxe.json | 11 + .../advancements/recipes/lead_plate.json | 11 + .../recipes/lead_powder_from_small.json | 11 + .../recipes/lead_pressure_plate.json | 11 + .../advancements/recipes/lead_rod.json | 11 + .../advancements/recipes/lead_scythe.json | 11 + .../advancements/recipes/lead_shears.json | 11 + .../advancements/recipes/lead_shield.json | 11 + .../advancements/recipes/lead_shovel.json | 11 + .../advancements/recipes/lead_slab.json | 11 + .../recipes/lead_smallpowder.json | 11 + .../advancements/recipes/lead_stairs.json | 11 + .../advancements/recipes/lead_sword.json | 11 + .../advancements/recipes/lead_trapdoor.json | 11 + .../advancements/recipes/lead_wall.json | 11 + .../recipes/mercury_ingot_from_nuggets.json | 11 + .../advancements/recipes/mercury_nuggets.json | 11 + .../recipes/mercury_powder_from_small.json | 11 + .../recipes/mercury_smallpowder.json | 11 + .../advancements/recipes/minecart.json | 11 + .../advancements/recipes/mithril_arrow.json | 11 + .../advancements/recipes/mithril_axe.json | 11 + .../advancements/recipes/mithril_bars.json | 11 + .../advancements/recipes/mithril_bars_2.json | 11 + .../advancements/recipes/mithril_blend.json | 11 + .../recipes/mithril_blend_from_small.json | 11 + .../advancements/recipes/mithril_block.json | 11 + .../recipes/mithril_block_ingot.json | 11 + .../advancements/recipes/mithril_bolt.json | 11 + .../advancements/recipes/mithril_boots.json | 11 + .../advancements/recipes/mithril_bow.json | 11 + .../advancements/recipes/mithril_button.json | 11 + .../recipes/mithril_chestplate.json | 11 + .../recipes/mithril_crackhammer.json | 11 + .../recipes/mithril_crossbow.json | 11 + .../advancements/recipes/mithril_door.json | 11 + .../recipes/mithril_fishingrod.json | 11 + .../advancements/recipes/mithril_gear.json | 11 + .../advancements/recipes/mithril_helmet.json | 11 + .../advancements/recipes/mithril_hoe.json | 11 + .../recipes/mithril_horsearmor.json | 11 + .../recipes/mithril_ingot_from_nuggets.json | 11 + .../recipes/mithril_leggings.json | 11 + .../advancements/recipes/mithril_lever.json | 11 + .../advancements/recipes/mithril_nuggets.json | 11 + .../advancements/recipes/mithril_pickaxe.json | 11 + .../advancements/recipes/mithril_plate.json | 11 + .../recipes/mithril_powder_from_small.json | 11 + .../recipes/mithril_pressure_plate.json | 11 + .../advancements/recipes/mithril_rod.json | 11 + .../advancements/recipes/mithril_scythe.json | 11 + .../advancements/recipes/mithril_shears.json | 11 + .../advancements/recipes/mithril_shield.json | 11 + .../advancements/recipes/mithril_shovel.json | 11 + .../advancements/recipes/mithril_slab.json | 11 + .../recipes/mithril_smallblend.json | 11 + .../recipes/mithril_smallpowder.json | 11 + .../advancements/recipes/mithril_stairs.json | 11 + .../advancements/recipes/mithril_sword.json | 11 + .../recipes/mithril_trapdoor.json | 11 + .../advancements/recipes/mithril_wall.json | 11 + .../advancements/recipes/nickel_arrow.json | 11 + .../advancements/recipes/nickel_axe.json | 11 + .../advancements/recipes/nickel_bars.json | 11 + .../advancements/recipes/nickel_bars_2.json | 11 + .../advancements/recipes/nickel_block.json | 11 + .../recipes/nickel_block_ingot.json | 11 + .../advancements/recipes/nickel_bolt.json | 11 + .../advancements/recipes/nickel_boots.json | 11 + .../advancements/recipes/nickel_bow.json | 11 + .../advancements/recipes/nickel_button.json | 11 + .../recipes/nickel_chestplate.json | 11 + .../recipes/nickel_crackhammer.json | 11 + .../advancements/recipes/nickel_crossbow.json | 11 + .../advancements/recipes/nickel_door.json | 11 + .../recipes/nickel_fishingrod.json | 11 + .../advancements/recipes/nickel_gear.json | 11 + .../advancements/recipes/nickel_helmet.json | 11 + .../advancements/recipes/nickel_hoe.json | 11 + .../recipes/nickel_horsearmor.json | 11 + .../recipes/nickel_ingot_from_nuggets.json | 11 + .../advancements/recipes/nickel_leggings.json | 11 + .../advancements/recipes/nickel_lever.json | 11 + .../advancements/recipes/nickel_nuggets.json | 11 + .../advancements/recipes/nickel_pickaxe.json | 11 + .../advancements/recipes/nickel_plate.json | 11 + .../recipes/nickel_powder_from_small.json | 11 + .../recipes/nickel_pressure_plate.json | 11 + .../advancements/recipes/nickel_rod.json | 11 + .../advancements/recipes/nickel_scythe.json | 11 + .../advancements/recipes/nickel_shears.json | 11 + .../advancements/recipes/nickel_shield.json | 11 + .../advancements/recipes/nickel_shovel.json | 11 + .../advancements/recipes/nickel_slab.json | 11 + .../recipes/nickel_smallpowder.json | 11 + .../advancements/recipes/nickel_stairs.json | 11 + .../advancements/recipes/nickel_sword.json | 11 + .../advancements/recipes/nickel_trapdoor.json | 11 + .../advancements/recipes/nickel_wall.json | 11 + .../advancements/recipes/obsidian_arrow.json | 11 + .../advancements/recipes/obsidian_axe.json | 11 + .../advancements/recipes/obsidian_bars.json | 11 + .../advancements/recipes/obsidian_bars_2.json | 11 + .../advancements/recipes/obsidian_block.json | 11 + .../advancements/recipes/obsidian_bolt.json | 11 + .../advancements/recipes/obsidian_boots.json | 11 + .../advancements/recipes/obsidian_bow.json | 11 + .../advancements/recipes/obsidian_button.json | 11 + .../recipes/obsidian_chestplate.json | 11 + .../recipes/obsidian_crackhammer.json | 11 + .../recipes/obsidian_crossbow.json | 11 + .../advancements/recipes/obsidian_door.json | 11 + .../recipes/obsidian_fishingrod.json | 11 + .../advancements/recipes/obsidian_gear.json | 11 + .../advancements/recipes/obsidian_helmet.json | 11 + .../advancements/recipes/obsidian_hoe.json | 11 + .../recipes/obsidian_horsearmor.json | 11 + .../advancements/recipes/obsidian_ingot.json | 11 + .../recipes/obsidian_leggings.json | 11 + .../advancements/recipes/obsidian_lever.json | 11 + .../advancements/recipes/obsidian_nugget.json | 11 + .../recipes/obsidian_pickaxe.json | 11 + .../recipes/obsidian_powder_from_small.json | 11 + .../recipes/obsidian_pressure_plate.json | 11 + .../advancements/recipes/obsidian_rod.json | 11 + .../advancements/recipes/obsidian_scythe.json | 11 + .../advancements/recipes/obsidian_shears.json | 11 + .../advancements/recipes/obsidian_shield.json | 11 + .../advancements/recipes/obsidian_shovel.json | 11 + .../advancements/recipes/obsidian_slab.json | 11 + .../recipes/obsidian_smallpowder.json | 11 + .../advancements/recipes/obsidian_stairs.json | 11 + .../advancements/recipes/obsidian_sword.json | 11 + .../recipes/obsidian_trapdoor.json | 11 + .../advancements/recipes/obsidian_wall.json | 11 + .../advancements/recipes/pewter_arrow.json | 11 + .../advancements/recipes/pewter_axe.json | 11 + .../advancements/recipes/pewter_bars.json | 11 + .../advancements/recipes/pewter_bars_2.json | 11 + .../advancements/recipes/pewter_blend.json | 11 + .../recipes/pewter_blend_from_small.json | 11 + .../advancements/recipes/pewter_block.json | 11 + .../recipes/pewter_block_ingot.json | 11 + .../advancements/recipes/pewter_bolt.json | 11 + .../advancements/recipes/pewter_boots.json | 11 + .../advancements/recipes/pewter_bow.json | 11 + .../advancements/recipes/pewter_button.json | 11 + .../recipes/pewter_chestplate.json | 11 + .../recipes/pewter_crackhammer.json | 11 + .../advancements/recipes/pewter_crossbow.json | 11 + .../advancements/recipes/pewter_door.json | 11 + .../recipes/pewter_fishingrod.json | 11 + .../advancements/recipes/pewter_gear.json | 11 + .../advancements/recipes/pewter_helmet.json | 11 + .../advancements/recipes/pewter_hoe.json | 11 + .../recipes/pewter_horsearmor.json | 11 + .../recipes/pewter_ingot_from_nuggets.json | 11 + .../advancements/recipes/pewter_leggings.json | 11 + .../advancements/recipes/pewter_lever.json | 11 + .../advancements/recipes/pewter_nuggets.json | 11 + .../advancements/recipes/pewter_pickaxe.json | 11 + .../advancements/recipes/pewter_plate.json | 11 + .../recipes/pewter_powder_from_small.json | 11 + .../recipes/pewter_pressure_plate.json | 11 + .../advancements/recipes/pewter_rod.json | 11 + .../advancements/recipes/pewter_scythe.json | 11 + .../advancements/recipes/pewter_shears.json | 11 + .../advancements/recipes/pewter_shield.json | 11 + .../advancements/recipes/pewter_shovel.json | 11 + .../advancements/recipes/pewter_slab.json | 11 + .../recipes/pewter_smallblend.json | 11 + .../recipes/pewter_smallpowder.json | 11 + .../advancements/recipes/pewter_stairs.json | 11 + .../advancements/recipes/pewter_sword.json | 11 + .../advancements/recipes/pewter_trapdoor.json | 11 + .../advancements/recipes/pewter_wall.json | 11 + .../advancements/recipes/piston.json | 11 + .../advancements/recipes/platinum_arrow.json | 11 + .../advancements/recipes/platinum_axe.json | 11 + .../advancements/recipes/platinum_bars.json | 11 + .../advancements/recipes/platinum_bars_2.json | 11 + .../advancements/recipes/platinum_block.json | 11 + .../recipes/platinum_block_ingot.json | 11 + .../advancements/recipes/platinum_bolt.json | 11 + .../advancements/recipes/platinum_boots.json | 11 + .../advancements/recipes/platinum_bow.json | 11 + .../advancements/recipes/platinum_button.json | 11 + .../recipes/platinum_chestplate.json | 11 + .../recipes/platinum_crackhammer.json | 11 + .../recipes/platinum_crossbow.json | 11 + .../advancements/recipes/platinum_door.json | 11 + .../recipes/platinum_fishingrod.json | 11 + .../advancements/recipes/platinum_gear.json | 11 + .../advancements/recipes/platinum_helmet.json | 11 + .../advancements/recipes/platinum_hoe.json | 11 + .../recipes/platinum_horsearmor.json | 11 + .../recipes/platinum_ingot_from_nuggets.json | 11 + .../recipes/platinum_leggings.json | 11 + .../advancements/recipes/platinum_lever.json | 11 + .../recipes/platinum_nuggets.json | 11 + .../recipes/platinum_pickaxe.json | 11 + .../advancements/recipes/platinum_plate.json | 11 + .../recipes/platinum_powder_from_small.json | 11 + .../recipes/platinum_pressure_plate.json | 11 + .../advancements/recipes/platinum_rod.json | 11 + .../advancements/recipes/platinum_scythe.json | 11 + .../advancements/recipes/platinum_shears.json | 11 + .../advancements/recipes/platinum_shield.json | 11 + .../advancements/recipes/platinum_shovel.json | 11 + .../advancements/recipes/platinum_slab.json | 11 + .../recipes/platinum_smallpowder.json | 11 + .../advancements/recipes/platinum_stairs.json | 11 + .../advancements/recipes/platinum_sword.json | 11 + .../recipes/platinum_trapdoor.json | 11 + .../advancements/recipes/platinum_wall.json | 11 + .../advancements/recipes/quartz_arrow.json | 11 + .../advancements/recipes/quartz_axe.json | 11 + .../advancements/recipes/quartz_bars.json | 11 + .../advancements/recipes/quartz_bars_2.json | 11 + .../advancements/recipes/quartz_bolt.json | 11 + .../advancements/recipes/quartz_boots.json | 11 + .../advancements/recipes/quartz_bow.json | 11 + .../advancements/recipes/quartz_button.json | 11 + .../recipes/quartz_chestplate.json | 11 + .../recipes/quartz_crackhammer.json | 11 + .../advancements/recipes/quartz_crossbow.json | 11 + .../advancements/recipes/quartz_door.json | 11 + .../recipes/quartz_fishingrod.json | 11 + .../advancements/recipes/quartz_gear.json | 11 + .../advancements/recipes/quartz_helmet.json | 11 + .../advancements/recipes/quartz_hoe.json | 11 + .../recipes/quartz_horsearmor.json | 11 + .../advancements/recipes/quartz_ingot.json | 11 + .../advancements/recipes/quartz_leggings.json | 11 + .../advancements/recipes/quartz_lever.json | 11 + .../advancements/recipes/quartz_nugget.json | 11 + .../advancements/recipes/quartz_pickaxe.json | 11 + .../recipes/quartz_powder_from_small.json | 11 + .../recipes/quartz_pressure_plate.json | 11 + .../advancements/recipes/quartz_rod.json | 11 + .../advancements/recipes/quartz_scythe.json | 11 + .../advancements/recipes/quartz_shears.json | 11 + .../advancements/recipes/quartz_shield.json | 11 + .../advancements/recipes/quartz_shovel.json | 11 + .../recipes/quartz_smallpowder.json | 11 + .../advancements/recipes/quartz_sword.json | 11 + .../advancements/recipes/quartz_trapdoor.json | 11 + .../advancements/recipes/quartz_wall.json | 11 + .../basemetals/advancements/recipes/rail.json | 11 + .../recipes/redstone_from_smallpowder.json | 11 + .../recipes/redstone_smallpowder.json | 11 + .../advancements/recipes/silver_arrow.json | 11 + .../advancements/recipes/silver_axe.json | 11 + .../advancements/recipes/silver_bars.json | 11 + .../advancements/recipes/silver_bars_2.json | 11 + .../advancements/recipes/silver_block.json | 11 + .../recipes/silver_block_ingot.json | 11 + .../advancements/recipes/silver_bolt.json | 11 + .../advancements/recipes/silver_boots.json | 11 + .../advancements/recipes/silver_bow.json | 11 + .../advancements/recipes/silver_button.json | 11 + .../recipes/silver_chestplate.json | 11 + .../recipes/silver_crackhammer.json | 11 + .../advancements/recipes/silver_crossbow.json | 11 + .../advancements/recipes/silver_door.json | 11 + .../recipes/silver_fishingrod.json | 11 + .../advancements/recipes/silver_gear.json | 11 + .../advancements/recipes/silver_helmet.json | 11 + .../advancements/recipes/silver_hoe.json | 11 + .../recipes/silver_horsearmor.json | 11 + .../recipes/silver_ingot_from_nuggets.json | 11 + .../advancements/recipes/silver_leggings.json | 11 + .../advancements/recipes/silver_lever.json | 11 + .../advancements/recipes/silver_nuggets.json | 11 + .../advancements/recipes/silver_pickaxe.json | 11 + .../advancements/recipes/silver_plate.json | 11 + .../recipes/silver_powder_from_small.json | 11 + .../recipes/silver_pressure_plate.json | 11 + .../advancements/recipes/silver_rod.json | 11 + .../advancements/recipes/silver_scythe.json | 11 + .../advancements/recipes/silver_shears.json | 11 + .../advancements/recipes/silver_shield.json | 11 + .../advancements/recipes/silver_shovel.json | 11 + .../advancements/recipes/silver_slab.json | 11 + .../recipes/silver_smallpowder.json | 11 + .../advancements/recipes/silver_stairs.json | 11 + .../advancements/recipes/silver_sword.json | 11 + .../advancements/recipes/silver_trapdoor.json | 11 + .../advancements/recipes/silver_wall.json | 11 + .../advancements/recipes/starsteel_arrow.json | 11 + .../advancements/recipes/starsteel_axe.json | 11 + .../advancements/recipes/starsteel_bars.json | 11 + .../recipes/starsteel_bars_2.json | 11 + .../advancements/recipes/starsteel_block.json | 11 + .../recipes/starsteel_block_ingot.json | 11 + .../advancements/recipes/starsteel_bolt.json | 11 + .../advancements/recipes/starsteel_boots.json | 11 + .../advancements/recipes/starsteel_bow.json | 11 + .../recipes/starsteel_button.json | 11 + .../recipes/starsteel_chestplate.json | 11 + .../recipes/starsteel_crackhammer.json | 11 + .../recipes/starsteel_crossbow.json | 11 + .../advancements/recipes/starsteel_door.json | 11 + .../recipes/starsteel_fishingrod.json | 11 + .../advancements/recipes/starsteel_gear.json | 11 + .../recipes/starsteel_helmet.json | 11 + .../advancements/recipes/starsteel_hoe.json | 11 + .../recipes/starsteel_horsearmor.json | 11 + .../recipes/starsteel_ingot_from_nuggets.json | 11 + .../recipes/starsteel_leggings.json | 11 + .../advancements/recipes/starsteel_lever.json | 11 + .../recipes/starsteel_nuggets.json | 11 + .../recipes/starsteel_pickaxe.json | 11 + .../advancements/recipes/starsteel_plate.json | 11 + .../recipes/starsteel_powder_from_small.json | 11 + .../recipes/starsteel_pressure_plate.json | 11 + .../advancements/recipes/starsteel_rod.json | 11 + .../recipes/starsteel_scythe.json | 11 + .../recipes/starsteel_shears.json | 11 + .../recipes/starsteel_shield.json | 11 + .../recipes/starsteel_shovel.json | 11 + .../advancements/recipes/starsteel_slab.json | 11 + .../recipes/starsteel_smallpowder.json | 11 + .../recipes/starsteel_stairs.json | 11 + .../advancements/recipes/starsteel_sword.json | 11 + .../recipes/starsteel_trapdoor.json | 11 + .../advancements/recipes/starsteel_wall.json | 11 + .../advancements/recipes/steel_anvil.json | 11 + .../advancements/recipes/steel_arrow.json | 11 + .../advancements/recipes/steel_axe.json | 11 + .../advancements/recipes/steel_bars.json | 11 + .../advancements/recipes/steel_bars_2.json | 11 + .../advancements/recipes/steel_blend.json | 11 + .../recipes/steel_blend_from_small.json | 11 + .../advancements/recipes/steel_block.json | 11 + .../recipes/steel_block_ingot.json | 11 + .../advancements/recipes/steel_bolt.json | 11 + .../advancements/recipes/steel_boots.json | 11 + .../advancements/recipes/steel_bow.json | 11 + .../advancements/recipes/steel_button.json | 11 + .../recipes/steel_chestplate.json | 11 + .../recipes/steel_crackhammer.json | 11 + .../advancements/recipes/steel_crossbow.json | 11 + .../advancements/recipes/steel_door.json | 11 + .../recipes/steel_fishingrod.json | 11 + .../advancements/recipes/steel_gear.json | 11 + .../advancements/recipes/steel_helmet.json | 11 + .../advancements/recipes/steel_hoe.json | 11 + .../recipes/steel_horsearmor.json | 11 + .../recipes/steel_ingot_from_nuggets.json | 11 + .../advancements/recipes/steel_leggings.json | 11 + .../advancements/recipes/steel_lever.json | 11 + .../advancements/recipes/steel_nuggets.json | 11 + .../advancements/recipes/steel_pickaxe.json | 11 + .../advancements/recipes/steel_plate.json | 11 + .../recipes/steel_powder_from_small.json | 11 + .../recipes/steel_pressure_plate.json | 11 + .../advancements/recipes/steel_rod.json | 11 + .../advancements/recipes/steel_scythe.json | 11 + .../advancements/recipes/steel_shears.json | 11 + .../advancements/recipes/steel_shield.json | 11 + .../advancements/recipes/steel_shovel.json | 11 + .../advancements/recipes/steel_slab.json | 11 + .../recipes/steel_smallblend.json | 11 + .../recipes/steel_smallpowder.json | 11 + .../advancements/recipes/steel_stairs.json | 11 + .../advancements/recipes/steel_sword.json | 11 + .../advancements/recipes/steel_trapdoor.json | 11 + .../advancements/recipes/steel_wall.json | 11 + .../advancements/recipes/stone_anvil.json | 11 + .../recipes/stone_crackhammer.json | 11 + .../advancements/recipes/stone_scythe.json | 11 + .../advancements/recipes/tin_arrow.json | 11 + .../advancements/recipes/tin_axe.json | 11 + .../advancements/recipes/tin_bars.json | 11 + .../advancements/recipes/tin_bars_2.json | 11 + .../advancements/recipes/tin_block.json | 11 + .../advancements/recipes/tin_block_ingot.json | 11 + .../advancements/recipes/tin_bolt.json | 11 + .../advancements/recipes/tin_boots.json | 11 + .../advancements/recipes/tin_bow.json | 11 + .../advancements/recipes/tin_button.json | 11 + .../advancements/recipes/tin_chestplate.json | 11 + .../advancements/recipes/tin_crackhammer.json | 11 + .../advancements/recipes/tin_crossbow.json | 11 + .../advancements/recipes/tin_door.json | 11 + .../advancements/recipes/tin_fishingrod.json | 11 + .../advancements/recipes/tin_gear.json | 11 + .../advancements/recipes/tin_helmet.json | 11 + .../advancements/recipes/tin_hoe.json | 11 + .../advancements/recipes/tin_horsearmor.json | 11 + .../recipes/tin_ingot_from_nuggets.json | 11 + .../advancements/recipes/tin_leggings.json | 11 + .../advancements/recipes/tin_lever.json | 11 + .../advancements/recipes/tin_nuggets.json | 11 + .../advancements/recipes/tin_pickaxe.json | 11 + .../advancements/recipes/tin_plate.json | 11 + .../recipes/tin_powder_from_small.json | 11 + .../recipes/tin_pressure_plate.json | 11 + .../advancements/recipes/tin_rod.json | 11 + .../advancements/recipes/tin_scythe.json | 11 + .../advancements/recipes/tin_shears.json | 11 + .../advancements/recipes/tin_shield.json | 11 + .../advancements/recipes/tin_shovel.json | 11 + .../advancements/recipes/tin_slab.json | 11 + .../advancements/recipes/tin_smallpowder.json | 11 + .../advancements/recipes/tin_stairs.json | 11 + .../advancements/recipes/tin_sword.json | 11 + .../advancements/recipes/tin_trapdoor.json | 11 + .../advancements/recipes/tin_wall.json | 11 + .../advancements/recipes/tripwire_hook.json | 11 + .../recipes/wood_crackhammer.json | 11 + .../advancements/recipes/wood_scythe.json | 11 + .../advancements/recipes/zinc_arrow.json | 11 + .../advancements/recipes/zinc_axe.json | 11 + .../advancements/recipes/zinc_bars.json | 11 + .../advancements/recipes/zinc_bars_2.json | 11 + .../advancements/recipes/zinc_block.json | 11 + .../recipes/zinc_block_ingot.json | 11 + .../advancements/recipes/zinc_bolt.json | 11 + .../advancements/recipes/zinc_boots.json | 11 + .../advancements/recipes/zinc_bow.json | 11 + .../advancements/recipes/zinc_button.json | 11 + .../advancements/recipes/zinc_chestplate.json | 11 + .../recipes/zinc_crackhammer.json | 11 + .../advancements/recipes/zinc_crossbow.json | 11 + .../advancements/recipes/zinc_door.json | 11 + .../advancements/recipes/zinc_fishingrod.json | 11 + .../advancements/recipes/zinc_gear.json | 11 + .../advancements/recipes/zinc_helmet.json | 11 + .../advancements/recipes/zinc_hoe.json | 11 + .../advancements/recipes/zinc_horsearmor.json | 11 + .../recipes/zinc_ingot_from_nuggets.json | 11 + .../advancements/recipes/zinc_leggings.json | 11 + .../advancements/recipes/zinc_lever.json | 11 + .../advancements/recipes/zinc_nuggets.json | 11 + .../advancements/recipes/zinc_pickaxe.json | 11 + .../advancements/recipes/zinc_plate.json | 11 + .../recipes/zinc_powder_from_small.json | 11 + .../recipes/zinc_pressure_plate.json | 11 + .../advancements/recipes/zinc_rod.json | 11 + .../advancements/recipes/zinc_scythe.json | 11 + .../advancements/recipes/zinc_shears.json | 11 + .../advancements/recipes/zinc_shield.json | 11 + .../advancements/recipes/zinc_shovel.json | 11 + .../advancements/recipes/zinc_slab.json | 11 + .../recipes/zinc_smallpowder.json | 11 + .../advancements/recipes/zinc_stairs.json | 11 + .../advancements/recipes/zinc_sword.json | 11 + .../advancements/recipes/zinc_trapdoor.json | 11 + .../advancements/recipes/zinc_wall.json | 11 + .../chests/inject/abandoned_mineshaft.json | 364 +++++++++++-- .../chests/inject/desert_pyramid.json | 476 +++++++++++++++-- .../chests/inject/end_city_treasure.json | 436 +++++++++++++++- .../chests/inject/jungle_temple.json | 476 +++++++++++++++-- .../chests/inject/nether_bridge.json | 482 ++++++++++++++++-- .../chests/inject/simple_dungeon.json | 476 +++++++++++++++-- .../chests/inject/spawn_bonus_chest.json | 328 ++++++++++-- .../chests/inject/stronghold_corridor.json | 482 ++++++++++++++++-- .../chests/inject/stronghold_crossing.json | 358 +++++++++++-- .../chests/inject/village_blacksmith.json | 364 +++++++++++-- .../basemetals/recipes/activator_rail.json | 41 +- .../basemetals/recipes/adamantine_anvil.json | 37 +- .../basemetals/recipes/adamantine_arrow.json | 43 +- .../basemetals/recipes/adamantine_axe.json | 37 +- .../basemetals/recipes/adamantine_bars.json | 33 +- .../basemetals/recipes/adamantine_bars_2.json | 31 +- .../basemetals/recipes/adamantine_block.json | 33 +- .../recipes/adamantine_block_ingot.json | 25 +- .../basemetals/recipes/adamantine_bolt.json | 39 +- .../basemetals/recipes/adamantine_boots.json | 31 +- .../basemetals/recipes/adamantine_bow.json | 37 +- .../basemetals/recipes/adamantine_button.json | 31 +- .../recipes/adamantine_chestplate.json | 33 +- .../recipes/adamantine_crackhammer.json | 37 +- .../recipes/adamantine_crossbow.json | 41 +- .../basemetals/recipes/adamantine_door.json | 35 +- .../recipes/adamantine_fishingrod.json | 37 +- .../basemetals/recipes/adamantine_gear.json | 39 +- .../basemetals/recipes/adamantine_helmet.json | 31 +- .../basemetals/recipes/adamantine_hoe.json | 37 +- .../recipes/adamantine_horsearmor.json | 37 +- .../adamantine_ingot_from_nuggets.json | 33 +- .../recipes/adamantine_leggings.json | 33 +- .../basemetals/recipes/adamantine_lever.json | 35 +- .../recipes/adamantine_nuggets.json | 25 +- .../recipes/adamantine_pickaxe.json | 37 +- .../basemetals/recipes/adamantine_plate.json | 31 +- .../recipes/adamantine_powder_from_small.json | 33 +- .../recipes/adamantine_pressure_plate.json | 29 +- .../basemetals/recipes/adamantine_rod.json | 33 +- .../basemetals/recipes/adamantine_scythe.json | 37 +- .../basemetals/recipes/adamantine_shears.json | 31 +- .../basemetals/recipes/adamantine_shield.json | 37 +- .../basemetals/recipes/adamantine_shovel.json | 37 +- .../basemetals/recipes/adamantine_slab.json | 31 +- .../recipes/adamantine_smallpowder.json | 25 +- .../basemetals/recipes/adamantine_stairs.json | 35 +- .../basemetals/recipes/adamantine_sword.json | 37 +- .../recipes/adamantine_trapdoor.json | 31 +- .../basemetals/recipes/adamantine_wall.json | 33 +- .../basemetals/recipes/antimony_arrow.json | 43 +- .../data/basemetals/recipes/antimony_axe.json | 37 +- .../basemetals/recipes/antimony_bars.json | 33 +- .../basemetals/recipes/antimony_bars_2.json | 31 +- .../basemetals/recipes/antimony_block.json | 33 +- .../recipes/antimony_block_ingot.json | 25 +- .../basemetals/recipes/antimony_bolt.json | 39 +- .../basemetals/recipes/antimony_boots.json | 31 +- .../data/basemetals/recipes/antimony_bow.json | 37 +- .../basemetals/recipes/antimony_button.json | 31 +- .../recipes/antimony_chestplate.json | 33 +- .../recipes/antimony_crackhammer.json | 37 +- .../basemetals/recipes/antimony_crossbow.json | 41 +- .../basemetals/recipes/antimony_door.json | 35 +- .../recipes/antimony_fishingrod.json | 37 +- .../basemetals/recipes/antimony_gear.json | 39 +- .../basemetals/recipes/antimony_helmet.json | 31 +- .../data/basemetals/recipes/antimony_hoe.json | 37 +- .../recipes/antimony_horsearmor.json | 37 +- .../recipes/antimony_ingot_from_nuggets.json | 33 +- .../basemetals/recipes/antimony_leggings.json | 33 +- .../basemetals/recipes/antimony_lever.json | 35 +- .../basemetals/recipes/antimony_nuggets.json | 25 +- .../basemetals/recipes/antimony_pickaxe.json | 37 +- .../basemetals/recipes/antimony_plate.json | 31 +- .../recipes/antimony_powder_from_small.json | 33 +- .../recipes/antimony_pressure_plate.json | 29 +- .../data/basemetals/recipes/antimony_rod.json | 33 +- .../basemetals/recipes/antimony_scythe.json | 37 +- .../basemetals/recipes/antimony_shears.json | 31 +- .../basemetals/recipes/antimony_shield.json | 37 +- .../basemetals/recipes/antimony_shovel.json | 37 +- .../basemetals/recipes/antimony_slab.json | 31 +- .../recipes/antimony_smallpowder.json | 25 +- .../basemetals/recipes/antimony_stairs.json | 35 +- .../basemetals/recipes/antimony_sword.json | 37 +- .../basemetals/recipes/antimony_trapdoor.json | 31 +- .../basemetals/recipes/antimony_wall.json | 33 +- .../basemetals/recipes/aquarium_arrow.json | 43 +- .../data/basemetals/recipes/aquarium_axe.json | 37 +- .../basemetals/recipes/aquarium_bars.json | 33 +- .../basemetals/recipes/aquarium_bars_2.json | 31 +- .../basemetals/recipes/aquarium_blend.json | 41 +- .../recipes/aquarium_blend_from_small.json | 33 +- .../basemetals/recipes/aquarium_block.json | 33 +- .../recipes/aquarium_block_ingot.json | 25 +- .../basemetals/recipes/aquarium_bolt.json | 39 +- .../basemetals/recipes/aquarium_boots.json | 31 +- .../data/basemetals/recipes/aquarium_bow.json | 37 +- .../basemetals/recipes/aquarium_button.json | 31 +- .../recipes/aquarium_chestplate.json | 33 +- .../recipes/aquarium_crackhammer.json | 37 +- .../basemetals/recipes/aquarium_crossbow.json | 41 +- .../basemetals/recipes/aquarium_door.json | 35 +- .../recipes/aquarium_fishingrod.json | 37 +- .../basemetals/recipes/aquarium_gear.json | 39 +- .../basemetals/recipes/aquarium_helmet.json | 31 +- .../data/basemetals/recipes/aquarium_hoe.json | 37 +- .../recipes/aquarium_horsearmor.json | 37 +- .../recipes/aquarium_ingot_from_nuggets.json | 33 +- .../basemetals/recipes/aquarium_leggings.json | 33 +- .../basemetals/recipes/aquarium_lever.json | 35 +- .../basemetals/recipes/aquarium_nuggets.json | 25 +- .../basemetals/recipes/aquarium_pickaxe.json | 37 +- .../basemetals/recipes/aquarium_plate.json | 31 +- .../recipes/aquarium_powder_from_small.json | 33 +- .../recipes/aquarium_pressure_plate.json | 29 +- .../data/basemetals/recipes/aquarium_rod.json | 33 +- .../basemetals/recipes/aquarium_scythe.json | 37 +- .../basemetals/recipes/aquarium_shears.json | 31 +- .../basemetals/recipes/aquarium_shield.json | 37 +- .../basemetals/recipes/aquarium_shovel.json | 37 +- .../basemetals/recipes/aquarium_slab.json | 31 +- .../recipes/aquarium_smallblend.json | 25 +- .../recipes/aquarium_smallpowder.json | 25 +- .../basemetals/recipes/aquarium_stairs.json | 35 +- .../basemetals/recipes/aquarium_sword.json | 37 +- .../basemetals/recipes/aquarium_trapdoor.json | 31 +- .../basemetals/recipes/aquarium_wall.json | 33 +- .../basemetals/recipes/bismuth_arrow.json | 43 +- .../data/basemetals/recipes/bismuth_axe.json | 37 +- .../data/basemetals/recipes/bismuth_bars.json | 33 +- .../basemetals/recipes/bismuth_bars_2.json | 31 +- .../basemetals/recipes/bismuth_block.json | 33 +- .../recipes/bismuth_block_ingot.json | 25 +- .../data/basemetals/recipes/bismuth_bolt.json | 39 +- .../basemetals/recipes/bismuth_boots.json | 31 +- .../data/basemetals/recipes/bismuth_bow.json | 37 +- .../basemetals/recipes/bismuth_button.json | 31 +- .../recipes/bismuth_chestplate.json | 33 +- .../recipes/bismuth_crackhammer.json | 37 +- .../basemetals/recipes/bismuth_crossbow.json | 41 +- .../data/basemetals/recipes/bismuth_door.json | 35 +- .../recipes/bismuth_fishingrod.json | 37 +- .../data/basemetals/recipes/bismuth_gear.json | 39 +- .../basemetals/recipes/bismuth_helmet.json | 31 +- .../data/basemetals/recipes/bismuth_hoe.json | 37 +- .../recipes/bismuth_horsearmor.json | 37 +- .../recipes/bismuth_ingot_from_nuggets.json | 33 +- .../basemetals/recipes/bismuth_leggings.json | 33 +- .../basemetals/recipes/bismuth_lever.json | 35 +- .../basemetals/recipes/bismuth_nuggets.json | 25 +- .../basemetals/recipes/bismuth_pickaxe.json | 37 +- .../basemetals/recipes/bismuth_plate.json | 31 +- .../recipes/bismuth_powder_from_small.json | 33 +- .../recipes/bismuth_pressure_plate.json | 29 +- .../data/basemetals/recipes/bismuth_rod.json | 33 +- .../basemetals/recipes/bismuth_scythe.json | 37 +- .../basemetals/recipes/bismuth_shears.json | 31 +- .../basemetals/recipes/bismuth_shield.json | 37 +- .../basemetals/recipes/bismuth_shovel.json | 37 +- .../data/basemetals/recipes/bismuth_slab.json | 31 +- .../recipes/bismuth_smallpowder.json | 25 +- .../basemetals/recipes/bismuth_stairs.json | 35 +- .../basemetals/recipes/bismuth_sword.json | 37 +- .../basemetals/recipes/bismuth_trapdoor.json | 31 +- .../data/basemetals/recipes/bismuth_wall.json | 33 +- .../data/basemetals/recipes/brass_arrow.json | 43 +- .../data/basemetals/recipes/brass_axe.json | 37 +- .../data/basemetals/recipes/brass_bars.json | 33 +- .../data/basemetals/recipes/brass_bars_2.json | 31 +- .../data/basemetals/recipes/brass_blend.json | 41 +- .../recipes/brass_blend_from_small.json | 33 +- .../data/basemetals/recipes/brass_block.json | 33 +- .../basemetals/recipes/brass_block_ingot.json | 25 +- .../data/basemetals/recipes/brass_bolt.json | 39 +- .../data/basemetals/recipes/brass_boots.json | 31 +- .../data/basemetals/recipes/brass_bow.json | 37 +- .../data/basemetals/recipes/brass_button.json | 31 +- .../basemetals/recipes/brass_chestplate.json | 33 +- .../basemetals/recipes/brass_crackhammer.json | 37 +- .../basemetals/recipes/brass_crossbow.json | 41 +- .../data/basemetals/recipes/brass_door.json | 35 +- .../basemetals/recipes/brass_fishingrod.json | 37 +- .../data/basemetals/recipes/brass_gear.json | 39 +- .../data/basemetals/recipes/brass_helmet.json | 31 +- .../data/basemetals/recipes/brass_hoe.json | 37 +- .../basemetals/recipes/brass_horsearmor.json | 37 +- .../recipes/brass_ingot_from_nuggets.json | 33 +- .../basemetals/recipes/brass_leggings.json | 33 +- .../data/basemetals/recipes/brass_lever.json | 35 +- .../basemetals/recipes/brass_nuggets.json | 25 +- .../basemetals/recipes/brass_pickaxe.json | 37 +- .../data/basemetals/recipes/brass_plate.json | 31 +- .../recipes/brass_powder_from_small.json | 33 +- .../recipes/brass_pressure_plate.json | 29 +- .../data/basemetals/recipes/brass_rod.json | 33 +- .../data/basemetals/recipes/brass_scythe.json | 37 +- .../data/basemetals/recipes/brass_shears.json | 31 +- .../data/basemetals/recipes/brass_shield.json | 37 +- .../data/basemetals/recipes/brass_shovel.json | 37 +- .../data/basemetals/recipes/brass_slab.json | 31 +- .../basemetals/recipes/brass_smallblend.json | 25 +- .../basemetals/recipes/brass_smallpowder.json | 25 +- .../data/basemetals/recipes/brass_stairs.json | 35 +- .../data/basemetals/recipes/brass_sword.json | 37 +- .../basemetals/recipes/brass_trapdoor.json | 31 +- .../data/basemetals/recipes/brass_wall.json | 33 +- .../data/basemetals/recipes/bronze_arrow.json | 43 +- .../data/basemetals/recipes/bronze_axe.json | 37 +- .../data/basemetals/recipes/bronze_bars.json | 33 +- .../basemetals/recipes/bronze_bars_2.json | 31 +- .../data/basemetals/recipes/bronze_blend.json | 41 +- .../recipes/bronze_blend_from_small.json | 33 +- .../data/basemetals/recipes/bronze_block.json | 33 +- .../recipes/bronze_block_ingot.json | 25 +- .../data/basemetals/recipes/bronze_bolt.json | 39 +- .../data/basemetals/recipes/bronze_boots.json | 31 +- .../data/basemetals/recipes/bronze_bow.json | 37 +- .../basemetals/recipes/bronze_button.json | 31 +- .../basemetals/recipes/bronze_chestplate.json | 33 +- .../recipes/bronze_crackhammer.json | 37 +- .../basemetals/recipes/bronze_crossbow.json | 41 +- .../data/basemetals/recipes/bronze_door.json | 35 +- .../basemetals/recipes/bronze_fishingrod.json | 37 +- .../data/basemetals/recipes/bronze_gear.json | 39 +- .../basemetals/recipes/bronze_helmet.json | 31 +- .../data/basemetals/recipes/bronze_hoe.json | 37 +- .../basemetals/recipes/bronze_horsearmor.json | 37 +- .../recipes/bronze_ingot_from_nuggets.json | 33 +- .../basemetals/recipes/bronze_leggings.json | 33 +- .../data/basemetals/recipes/bronze_lever.json | 35 +- .../basemetals/recipes/bronze_nuggets.json | 25 +- .../basemetals/recipes/bronze_pickaxe.json | 37 +- .../data/basemetals/recipes/bronze_plate.json | 31 +- .../recipes/bronze_powder_from_small.json | 33 +- .../recipes/bronze_pressure_plate.json | 29 +- .../data/basemetals/recipes/bronze_rod.json | 33 +- .../basemetals/recipes/bronze_scythe.json | 37 +- .../basemetals/recipes/bronze_shears.json | 31 +- .../basemetals/recipes/bronze_shield.json | 37 +- .../basemetals/recipes/bronze_shovel.json | 37 +- .../data/basemetals/recipes/bronze_slab.json | 31 +- .../basemetals/recipes/bronze_smallblend.json | 25 +- .../recipes/bronze_smallpowder.json | 25 +- .../basemetals/recipes/bronze_stairs.json | 35 +- .../data/basemetals/recipes/bronze_sword.json | 37 +- .../basemetals/recipes/bronze_trapdoor.json | 31 +- .../data/basemetals/recipes/bronze_wall.json | 33 +- .../basemetals/recipes/charcoal_block.json | 33 +- .../recipes/charcoal_block_dust.json | 33 +- .../basemetals/recipes/charcoal_ingot.json | 33 +- .../basemetals/recipes/charcoal_nugget.json | 25 +- .../recipes/charcoal_powder_from_small.json | 33 +- .../recipes/charcoal_smallpowder.json | 25 +- .../basemetals/recipes/coal_block_dust.json | 33 +- .../data/basemetals/recipes/coal_ingot.json | 33 +- .../data/basemetals/recipes/coal_nugget.json | 25 +- .../recipes/coal_powder_from_small.json | 33 +- .../basemetals/recipes/coal_smallpowder.json | 25 +- .../basemetals/recipes/coldiron_arrow.json | 43 +- .../data/basemetals/recipes/coldiron_axe.json | 37 +- .../basemetals/recipes/coldiron_bars.json | 33 +- .../basemetals/recipes/coldiron_bars_2.json | 31 +- .../basemetals/recipes/coldiron_block.json | 33 +- .../recipes/coldiron_block_ingot.json | 25 +- .../basemetals/recipes/coldiron_bolt.json | 39 +- .../basemetals/recipes/coldiron_boots.json | 31 +- .../data/basemetals/recipes/coldiron_bow.json | 37 +- .../basemetals/recipes/coldiron_button.json | 31 +- .../recipes/coldiron_chestplate.json | 33 +- .../recipes/coldiron_crackhammer.json | 37 +- .../basemetals/recipes/coldiron_crossbow.json | 41 +- .../basemetals/recipes/coldiron_door.json | 35 +- .../recipes/coldiron_fishingrod.json | 37 +- .../basemetals/recipes/coldiron_gear.json | 39 +- .../basemetals/recipes/coldiron_helmet.json | 31 +- .../data/basemetals/recipes/coldiron_hoe.json | 37 +- .../recipes/coldiron_horsearmor.json | 37 +- .../recipes/coldiron_ingot_from_nuggets.json | 33 +- .../basemetals/recipes/coldiron_leggings.json | 33 +- .../basemetals/recipes/coldiron_lever.json | 35 +- .../basemetals/recipes/coldiron_nuggets.json | 25 +- .../basemetals/recipes/coldiron_pickaxe.json | 37 +- .../basemetals/recipes/coldiron_plate.json | 31 +- .../recipes/coldiron_powder_from_small.json | 33 +- .../recipes/coldiron_pressure_plate.json | 29 +- .../data/basemetals/recipes/coldiron_rod.json | 33 +- .../basemetals/recipes/coldiron_scythe.json | 37 +- .../basemetals/recipes/coldiron_shears.json | 31 +- .../basemetals/recipes/coldiron_shield.json | 37 +- .../basemetals/recipes/coldiron_shovel.json | 37 +- .../basemetals/recipes/coldiron_slab.json | 31 +- .../recipes/coldiron_smallpowder.json | 25 +- .../basemetals/recipes/coldiron_stairs.json | 35 +- .../basemetals/recipes/coldiron_sword.json | 37 +- .../basemetals/recipes/coldiron_trapdoor.json | 31 +- .../basemetals/recipes/coldiron_wall.json | 33 +- .../data/basemetals/recipes/copper_arrow.json | 43 +- .../data/basemetals/recipes/copper_axe.json | 37 +- .../data/basemetals/recipes/copper_bars.json | 33 +- .../basemetals/recipes/copper_bars_2.json | 31 +- .../data/basemetals/recipes/copper_block.json | 33 +- .../recipes/copper_block_ingot.json | 25 +- .../data/basemetals/recipes/copper_bolt.json | 39 +- .../data/basemetals/recipes/copper_boots.json | 31 +- .../data/basemetals/recipes/copper_bow.json | 37 +- .../basemetals/recipes/copper_button.json | 31 +- .../basemetals/recipes/copper_chestplate.json | 33 +- .../recipes/copper_crackhammer.json | 37 +- .../basemetals/recipes/copper_crossbow.json | 41 +- .../data/basemetals/recipes/copper_door.json | 35 +- .../basemetals/recipes/copper_fishingrod.json | 37 +- .../data/basemetals/recipes/copper_gear.json | 39 +- .../basemetals/recipes/copper_helmet.json | 31 +- .../data/basemetals/recipes/copper_hoe.json | 37 +- .../basemetals/recipes/copper_horsearmor.json | 37 +- .../recipes/copper_ingot_from_nuggets.json | 33 +- .../basemetals/recipes/copper_leggings.json | 33 +- .../data/basemetals/recipes/copper_lever.json | 35 +- .../basemetals/recipes/copper_nuggets.json | 25 +- .../basemetals/recipes/copper_pickaxe.json | 37 +- .../data/basemetals/recipes/copper_plate.json | 31 +- .../recipes/copper_powder_from_small.json | 33 +- .../recipes/copper_pressure_plate.json | 29 +- .../data/basemetals/recipes/copper_rod.json | 33 +- .../basemetals/recipes/copper_scythe.json | 37 +- .../basemetals/recipes/copper_shears.json | 31 +- .../basemetals/recipes/copper_shield.json | 37 +- .../basemetals/recipes/copper_shovel.json | 37 +- .../data/basemetals/recipes/copper_slab.json | 31 +- .../recipes/copper_smallpowder.json | 25 +- .../basemetals/recipes/copper_stairs.json | 35 +- .../data/basemetals/recipes/copper_sword.json | 37 +- .../basemetals/recipes/copper_trapdoor.json | 31 +- .../data/basemetals/recipes/copper_wall.json | 33 +- .../basemetals/recipes/cupronickel_arrow.json | 43 +- .../basemetals/recipes/cupronickel_axe.json | 37 +- .../basemetals/recipes/cupronickel_bars.json | 33 +- .../recipes/cupronickel_bars_2.json | 31 +- .../basemetals/recipes/cupronickel_blend.json | 41 +- .../recipes/cupronickel_blend_from_small.json | 33 +- .../basemetals/recipes/cupronickel_block.json | 33 +- .../recipes/cupronickel_block_ingot.json | 25 +- .../basemetals/recipes/cupronickel_bolt.json | 39 +- .../basemetals/recipes/cupronickel_boots.json | 31 +- .../basemetals/recipes/cupronickel_bow.json | 37 +- .../recipes/cupronickel_button.json | 31 +- .../recipes/cupronickel_chestplate.json | 33 +- .../recipes/cupronickel_crackhammer.json | 37 +- .../recipes/cupronickel_crossbow.json | 41 +- .../basemetals/recipes/cupronickel_door.json | 35 +- .../recipes/cupronickel_fishingrod.json | 37 +- .../basemetals/recipes/cupronickel_gear.json | 39 +- .../recipes/cupronickel_helmet.json | 31 +- .../basemetals/recipes/cupronickel_hoe.json | 37 +- .../recipes/cupronickel_horsearmor.json | 37 +- .../cupronickel_ingot_from_nuggets.json | 33 +- .../recipes/cupronickel_leggings.json | 33 +- .../basemetals/recipes/cupronickel_lever.json | 35 +- .../recipes/cupronickel_nuggets.json | 25 +- .../recipes/cupronickel_pickaxe.json | 37 +- .../basemetals/recipes/cupronickel_plate.json | 31 +- .../cupronickel_powder_from_small.json | 33 +- .../recipes/cupronickel_pressure_plate.json | 29 +- .../basemetals/recipes/cupronickel_rod.json | 33 +- .../recipes/cupronickel_scythe.json | 37 +- .../recipes/cupronickel_shears.json | 31 +- .../recipes/cupronickel_shield.json | 37 +- .../recipes/cupronickel_shovel.json | 37 +- .../basemetals/recipes/cupronickel_slab.json | 31 +- .../recipes/cupronickel_smallblend.json | 25 +- .../recipes/cupronickel_smallpowder.json | 25 +- .../recipes/cupronickel_stairs.json | 35 +- .../basemetals/recipes/cupronickel_sword.json | 37 +- .../recipes/cupronickel_trapdoor.json | 31 +- .../basemetals/recipes/cupronickel_wall.json | 33 +- .../basemetals/recipes/detector_rail.json | 41 +- .../basemetals/recipes/diamond_arrow.json | 43 +- .../data/basemetals/recipes/diamond_bars.json | 33 +- .../basemetals/recipes/diamond_bars_2.json | 31 +- .../data/basemetals/recipes/diamond_bolt.json | 39 +- .../data/basemetals/recipes/diamond_bow.json | 37 +- .../basemetals/recipes/diamond_button.json | 31 +- .../recipes/diamond_crackhammer.json | 37 +- .../basemetals/recipes/diamond_crossbow.json | 41 +- .../data/basemetals/recipes/diamond_door.json | 35 +- .../recipes/diamond_fishingrod.json | 37 +- .../data/basemetals/recipes/diamond_gear.json | 39 +- .../basemetals/recipes/diamond_lever.json | 35 +- .../recipes/diamond_powder_from_small.json | 33 +- .../recipes/diamond_pressure_plate.json | 29 +- .../data/basemetals/recipes/diamond_rod.json | 33 +- .../basemetals/recipes/diamond_scythe.json | 37 +- .../basemetals/recipes/diamond_shears.json | 31 +- .../basemetals/recipes/diamond_shield.json | 37 +- .../data/basemetals/recipes/diamond_slab.json | 31 +- .../recipes/diamond_smallpowder.json | 25 +- .../basemetals/recipes/diamond_stairs.json | 35 +- .../basemetals/recipes/diamond_trapdoor.json | 31 +- .../data/basemetals/recipes/diamond_wall.json | 33 +- .../basemetals/recipes/electrum_arrow.json | 43 +- .../data/basemetals/recipes/electrum_axe.json | 37 +- .../basemetals/recipes/electrum_bars.json | 33 +- .../basemetals/recipes/electrum_bars_2.json | 31 +- .../basemetals/recipes/electrum_blend.json | 29 +- .../recipes/electrum_blend_from_small.json | 33 +- .../basemetals/recipes/electrum_block.json | 33 +- .../recipes/electrum_block_ingot.json | 25 +- .../basemetals/recipes/electrum_bolt.json | 39 +- .../basemetals/recipes/electrum_boots.json | 31 +- .../data/basemetals/recipes/electrum_bow.json | 37 +- .../basemetals/recipes/electrum_button.json | 31 +- .../recipes/electrum_chestplate.json | 33 +- .../recipes/electrum_crackhammer.json | 37 +- .../basemetals/recipes/electrum_crossbow.json | 41 +- .../basemetals/recipes/electrum_door.json | 35 +- .../recipes/electrum_fishingrod.json | 37 +- .../basemetals/recipes/electrum_gear.json | 39 +- .../basemetals/recipes/electrum_helmet.json | 31 +- .../data/basemetals/recipes/electrum_hoe.json | 37 +- .../recipes/electrum_horsearmor.json | 37 +- .../recipes/electrum_ingot_from_nuggets.json | 33 +- .../basemetals/recipes/electrum_leggings.json | 33 +- .../basemetals/recipes/electrum_lever.json | 35 +- .../basemetals/recipes/electrum_nuggets.json | 25 +- .../basemetals/recipes/electrum_pickaxe.json | 37 +- .../basemetals/recipes/electrum_plate.json | 31 +- .../recipes/electrum_powder_from_small.json | 33 +- .../recipes/electrum_pressure_plate.json | 29 +- .../data/basemetals/recipes/electrum_rod.json | 33 +- .../basemetals/recipes/electrum_scythe.json | 37 +- .../basemetals/recipes/electrum_shears.json | 31 +- .../basemetals/recipes/electrum_shield.json | 37 +- .../basemetals/recipes/electrum_shovel.json | 37 +- .../basemetals/recipes/electrum_slab.json | 31 +- .../recipes/electrum_smallblend.json | 25 +- .../recipes/electrum_smallpowder.json | 25 +- .../basemetals/recipes/electrum_stairs.json | 35 +- .../basemetals/recipes/electrum_sword.json | 37 +- .../basemetals/recipes/electrum_trapdoor.json | 31 +- .../basemetals/recipes/electrum_wall.json | 33 +- .../basemetals/recipes/emerald_arrow.json | 43 +- .../data/basemetals/recipes/emerald_axe.json | 37 +- .../data/basemetals/recipes/emerald_bars.json | 33 +- .../basemetals/recipes/emerald_bars_2.json | 31 +- .../data/basemetals/recipes/emerald_bolt.json | 39 +- .../basemetals/recipes/emerald_boots.json | 31 +- .../data/basemetals/recipes/emerald_bow.json | 37 +- .../basemetals/recipes/emerald_button.json | 31 +- .../recipes/emerald_chestplate.json | 33 +- .../recipes/emerald_crackhammer.json | 37 +- .../basemetals/recipes/emerald_crossbow.json | 41 +- .../data/basemetals/recipes/emerald_door.json | 35 +- .../recipes/emerald_fishingrod.json | 37 +- .../data/basemetals/recipes/emerald_gear.json | 39 +- .../basemetals/recipes/emerald_helmet.json | 31 +- .../data/basemetals/recipes/emerald_hoe.json | 37 +- .../recipes/emerald_horsearmor.json | 37 +- .../basemetals/recipes/emerald_leggings.json | 33 +- .../basemetals/recipes/emerald_lever.json | 35 +- .../basemetals/recipes/emerald_pickaxe.json | 37 +- .../recipes/emerald_powder_from_small.json | 33 +- .../recipes/emerald_pressure_plate.json | 29 +- .../data/basemetals/recipes/emerald_rod.json | 33 +- .../basemetals/recipes/emerald_scythe.json | 37 +- .../basemetals/recipes/emerald_shears.json | 31 +- .../basemetals/recipes/emerald_shield.json | 37 +- .../basemetals/recipes/emerald_shovel.json | 37 +- .../data/basemetals/recipes/emerald_slab.json | 31 +- .../recipes/emerald_smallpowder.json | 25 +- .../basemetals/recipes/emerald_stairs.json | 35 +- .../basemetals/recipes/emerald_sword.json | 37 +- .../basemetals/recipes/emerald_trapdoor.json | 31 +- .../data/basemetals/recipes/emerald_wall.json | 33 +- .../basemetals/recipes/flint_and_steel.json | 27 +- .../data/basemetals/recipes/gold_arrow.json | 43 +- .../data/basemetals/recipes/gold_bars.json | 33 +- .../data/basemetals/recipes/gold_bars_2.json | 31 +- .../data/basemetals/recipes/gold_bolt.json | 39 +- .../data/basemetals/recipes/gold_bow.json | 37 +- .../data/basemetals/recipes/gold_button.json | 31 +- .../basemetals/recipes/gold_crackhammer.json | 37 +- .../basemetals/recipes/gold_crossbow.json | 41 +- .../data/basemetals/recipes/gold_door.json | 35 +- .../basemetals/recipes/gold_fishingrod.json | 37 +- .../data/basemetals/recipes/gold_gear.json | 39 +- .../data/basemetals/recipes/gold_lever.json | 35 +- .../data/basemetals/recipes/gold_plate.json | 31 +- .../recipes/gold_powder_from_small.json | 33 +- .../data/basemetals/recipes/gold_rod.json | 33 +- .../data/basemetals/recipes/gold_scythe.json | 37 +- .../data/basemetals/recipes/gold_shears.json | 31 +- .../data/basemetals/recipes/gold_shield.json | 37 +- .../data/basemetals/recipes/gold_slab.json | 31 +- .../basemetals/recipes/gold_smallpowder.json | 25 +- .../data/basemetals/recipes/gold_stairs.json | 35 +- .../basemetals/recipes/gold_trapdoor.json | 31 +- .../data/basemetals/recipes/gold_wall.json | 33 +- .../basemetals/recipes/human_detector.json | 35 +- .../data/basemetals/recipes/invar_arrow.json | 43 +- .../data/basemetals/recipes/invar_axe.json | 37 +- .../data/basemetals/recipes/invar_bars.json | 33 +- .../data/basemetals/recipes/invar_bars_2.json | 31 +- .../data/basemetals/recipes/invar_blend.json | 35 +- .../recipes/invar_blend_from_small.json | 33 +- .../data/basemetals/recipes/invar_block.json | 33 +- .../basemetals/recipes/invar_block_ingot.json | 25 +- .../data/basemetals/recipes/invar_bolt.json | 39 +- .../data/basemetals/recipes/invar_boots.json | 31 +- .../data/basemetals/recipes/invar_bow.json | 37 +- .../data/basemetals/recipes/invar_button.json | 31 +- .../basemetals/recipes/invar_chestplate.json | 33 +- .../basemetals/recipes/invar_crackhammer.json | 37 +- .../basemetals/recipes/invar_crossbow.json | 41 +- .../data/basemetals/recipes/invar_door.json | 35 +- .../basemetals/recipes/invar_fishingrod.json | 37 +- .../data/basemetals/recipes/invar_gear.json | 39 +- .../data/basemetals/recipes/invar_helmet.json | 31 +- .../data/basemetals/recipes/invar_hoe.json | 37 +- .../basemetals/recipes/invar_horsearmor.json | 37 +- .../recipes/invar_ingot_from_nuggets.json | 33 +- .../basemetals/recipes/invar_leggings.json | 33 +- .../data/basemetals/recipes/invar_lever.json | 35 +- .../basemetals/recipes/invar_nuggets.json | 25 +- .../basemetals/recipes/invar_pickaxe.json | 37 +- .../data/basemetals/recipes/invar_plate.json | 31 +- .../recipes/invar_powder_from_small.json | 33 +- .../recipes/invar_pressure_plate.json | 29 +- .../data/basemetals/recipes/invar_rod.json | 33 +- .../data/basemetals/recipes/invar_scythe.json | 37 +- .../data/basemetals/recipes/invar_shears.json | 31 +- .../data/basemetals/recipes/invar_shield.json | 37 +- .../data/basemetals/recipes/invar_shovel.json | 37 +- .../data/basemetals/recipes/invar_slab.json | 31 +- .../basemetals/recipes/invar_smallblend.json | 25 +- .../basemetals/recipes/invar_smallpowder.json | 25 +- .../data/basemetals/recipes/invar_stairs.json | 35 +- .../data/basemetals/recipes/invar_sword.json | 37 +- .../basemetals/recipes/invar_trapdoor.json | 31 +- .../data/basemetals/recipes/invar_wall.json | 33 +- .../data/basemetals/recipes/iron_arrow.json | 43 +- .../data/basemetals/recipes/iron_bars_2.json | 31 +- .../data/basemetals/recipes/iron_bolt.json | 39 +- .../data/basemetals/recipes/iron_bow.json | 37 +- .../data/basemetals/recipes/iron_button.json | 31 +- .../basemetals/recipes/iron_crackhammer.json | 37 +- .../basemetals/recipes/iron_crossbow.json | 41 +- .../basemetals/recipes/iron_fishingrod.json | 37 +- .../data/basemetals/recipes/iron_gear.json | 39 +- .../data/basemetals/recipes/iron_lever.json | 35 +- .../data/basemetals/recipes/iron_plate.json | 31 +- .../recipes/iron_powder_from_small.json | 33 +- .../data/basemetals/recipes/iron_rod.json | 33 +- .../data/basemetals/recipes/iron_scythe.json | 37 +- .../data/basemetals/recipes/iron_shield.json | 37 +- .../data/basemetals/recipes/iron_slab.json | 31 +- .../basemetals/recipes/iron_smallpowder.json | 25 +- .../data/basemetals/recipes/iron_stairs.json | 35 +- .../data/basemetals/recipes/iron_wall.json | 33 +- .../data/basemetals/recipes/lead_arrow.json | 43 +- .../data/basemetals/recipes/lead_axe.json | 37 +- .../data/basemetals/recipes/lead_bars.json | 33 +- .../data/basemetals/recipes/lead_bars_2.json | 31 +- .../data/basemetals/recipes/lead_block.json | 33 +- .../basemetals/recipes/lead_block_ingot.json | 25 +- .../data/basemetals/recipes/lead_bolt.json | 39 +- .../data/basemetals/recipes/lead_boots.json | 31 +- .../data/basemetals/recipes/lead_bow.json | 37 +- .../data/basemetals/recipes/lead_button.json | 31 +- .../basemetals/recipes/lead_chestplate.json | 33 +- .../basemetals/recipes/lead_crackhammer.json | 37 +- .../basemetals/recipes/lead_crossbow.json | 41 +- .../data/basemetals/recipes/lead_door.json | 35 +- .../basemetals/recipes/lead_fishingrod.json | 37 +- .../data/basemetals/recipes/lead_gear.json | 39 +- .../data/basemetals/recipes/lead_helmet.json | 31 +- .../data/basemetals/recipes/lead_hoe.json | 37 +- .../basemetals/recipes/lead_horsearmor.json | 37 +- .../recipes/lead_ingot_from_nuggets.json | 33 +- .../basemetals/recipes/lead_leggings.json | 33 +- .../data/basemetals/recipes/lead_lever.json | 35 +- .../data/basemetals/recipes/lead_nuggets.json | 25 +- .../data/basemetals/recipes/lead_pickaxe.json | 37 +- .../data/basemetals/recipes/lead_plate.json | 31 +- .../recipes/lead_powder_from_small.json | 33 +- .../recipes/lead_pressure_plate.json | 29 +- .../data/basemetals/recipes/lead_rod.json | 33 +- .../data/basemetals/recipes/lead_scythe.json | 37 +- .../data/basemetals/recipes/lead_shears.json | 31 +- .../data/basemetals/recipes/lead_shield.json | 37 +- .../data/basemetals/recipes/lead_shovel.json | 37 +- .../data/basemetals/recipes/lead_slab.json | 31 +- .../basemetals/recipes/lead_smallpowder.json | 25 +- .../data/basemetals/recipes/lead_stairs.json | 35 +- .../data/basemetals/recipes/lead_sword.json | 37 +- .../basemetals/recipes/lead_trapdoor.json | 31 +- .../data/basemetals/recipes/lead_wall.json | 33 +- .../recipes/mercury_ingot_from_nuggets.json | 33 +- .../basemetals/recipes/mercury_nuggets.json | 25 +- .../recipes/mercury_powder_from_small.json | 33 +- .../recipes/mercury_smallpowder.json | 25 +- .../recipes/mercury_smallpowder_smelting.json | 8 +- .../data/basemetals/recipes/minecart.json | 31 +- .../basemetals/recipes/mithril_arrow.json | 43 +- .../data/basemetals/recipes/mithril_axe.json | 37 +- .../data/basemetals/recipes/mithril_bars.json | 33 +- .../basemetals/recipes/mithril_bars_2.json | 31 +- .../basemetals/recipes/mithril_blend.json | 41 +- .../recipes/mithril_blend_from_small.json | 33 +- .../basemetals/recipes/mithril_block.json | 33 +- .../recipes/mithril_block_ingot.json | 25 +- .../data/basemetals/recipes/mithril_bolt.json | 39 +- .../basemetals/recipes/mithril_boots.json | 31 +- .../data/basemetals/recipes/mithril_bow.json | 37 +- .../basemetals/recipes/mithril_button.json | 31 +- .../recipes/mithril_chestplate.json | 33 +- .../recipes/mithril_crackhammer.json | 37 +- .../basemetals/recipes/mithril_crossbow.json | 41 +- .../data/basemetals/recipes/mithril_door.json | 35 +- .../recipes/mithril_fishingrod.json | 37 +- .../data/basemetals/recipes/mithril_gear.json | 39 +- .../basemetals/recipes/mithril_helmet.json | 31 +- .../data/basemetals/recipes/mithril_hoe.json | 37 +- .../recipes/mithril_horsearmor.json | 37 +- .../recipes/mithril_ingot_from_nuggets.json | 33 +- .../basemetals/recipes/mithril_leggings.json | 33 +- .../basemetals/recipes/mithril_lever.json | 35 +- .../basemetals/recipes/mithril_nuggets.json | 25 +- .../basemetals/recipes/mithril_pickaxe.json | 37 +- .../basemetals/recipes/mithril_plate.json | 31 +- .../recipes/mithril_powder_from_small.json | 33 +- .../recipes/mithril_pressure_plate.json | 29 +- .../data/basemetals/recipes/mithril_rod.json | 33 +- .../basemetals/recipes/mithril_scythe.json | 37 +- .../basemetals/recipes/mithril_shears.json | 31 +- .../basemetals/recipes/mithril_shield.json | 37 +- .../basemetals/recipes/mithril_shovel.json | 37 +- .../data/basemetals/recipes/mithril_slab.json | 31 +- .../recipes/mithril_smallblend.json | 25 +- .../recipes/mithril_smallpowder.json | 25 +- .../basemetals/recipes/mithril_stairs.json | 35 +- .../basemetals/recipes/mithril_sword.json | 37 +- .../basemetals/recipes/mithril_trapdoor.json | 31 +- .../data/basemetals/recipes/mithril_wall.json | 33 +- .../data/basemetals/recipes/nickel_arrow.json | 43 +- .../data/basemetals/recipes/nickel_axe.json | 37 +- .../data/basemetals/recipes/nickel_bars.json | 33 +- .../basemetals/recipes/nickel_bars_2.json | 31 +- .../data/basemetals/recipes/nickel_block.json | 33 +- .../recipes/nickel_block_ingot.json | 25 +- .../data/basemetals/recipes/nickel_bolt.json | 39 +- .../data/basemetals/recipes/nickel_boots.json | 31 +- .../data/basemetals/recipes/nickel_bow.json | 37 +- .../basemetals/recipes/nickel_button.json | 31 +- .../basemetals/recipes/nickel_chestplate.json | 33 +- .../recipes/nickel_crackhammer.json | 37 +- .../basemetals/recipes/nickel_crossbow.json | 41 +- .../data/basemetals/recipes/nickel_door.json | 35 +- .../basemetals/recipes/nickel_fishingrod.json | 37 +- .../data/basemetals/recipes/nickel_gear.json | 39 +- .../basemetals/recipes/nickel_helmet.json | 31 +- .../data/basemetals/recipes/nickel_hoe.json | 37 +- .../basemetals/recipes/nickel_horsearmor.json | 37 +- .../recipes/nickel_ingot_from_nuggets.json | 33 +- .../basemetals/recipes/nickel_leggings.json | 33 +- .../data/basemetals/recipes/nickel_lever.json | 35 +- .../basemetals/recipes/nickel_nuggets.json | 25 +- .../basemetals/recipes/nickel_pickaxe.json | 37 +- .../data/basemetals/recipes/nickel_plate.json | 31 +- .../recipes/nickel_powder_from_small.json | 33 +- .../recipes/nickel_pressure_plate.json | 29 +- .../data/basemetals/recipes/nickel_rod.json | 33 +- .../basemetals/recipes/nickel_scythe.json | 37 +- .../basemetals/recipes/nickel_shears.json | 31 +- .../basemetals/recipes/nickel_shield.json | 37 +- .../basemetals/recipes/nickel_shovel.json | 37 +- .../data/basemetals/recipes/nickel_slab.json | 31 +- .../recipes/nickel_smallpowder.json | 25 +- .../basemetals/recipes/nickel_stairs.json | 35 +- .../data/basemetals/recipes/nickel_sword.json | 37 +- .../basemetals/recipes/nickel_trapdoor.json | 31 +- .../data/basemetals/recipes/nickel_wall.json | 33 +- .../basemetals/recipes/obsidian_arrow.json | 43 +- .../data/basemetals/recipes/obsidian_axe.json | 37 +- .../basemetals/recipes/obsidian_bars.json | 33 +- .../basemetals/recipes/obsidian_bars_2.json | 31 +- .../basemetals/recipes/obsidian_block.json | 33 +- .../basemetals/recipes/obsidian_bolt.json | 39 +- .../basemetals/recipes/obsidian_boots.json | 31 +- .../data/basemetals/recipes/obsidian_bow.json | 37 +- .../basemetals/recipes/obsidian_button.json | 31 +- .../recipes/obsidian_chestplate.json | 33 +- .../recipes/obsidian_crackhammer.json | 37 +- .../basemetals/recipes/obsidian_crossbow.json | 41 +- .../basemetals/recipes/obsidian_door.json | 35 +- .../recipes/obsidian_fishingrod.json | 37 +- .../basemetals/recipes/obsidian_gear.json | 39 +- .../basemetals/recipes/obsidian_helmet.json | 31 +- .../data/basemetals/recipes/obsidian_hoe.json | 37 +- .../recipes/obsidian_horsearmor.json | 37 +- .../basemetals/recipes/obsidian_ingot.json | 33 +- .../basemetals/recipes/obsidian_leggings.json | 33 +- .../basemetals/recipes/obsidian_lever.json | 35 +- .../basemetals/recipes/obsidian_nugget.json | 25 +- .../basemetals/recipes/obsidian_pickaxe.json | 37 +- .../recipes/obsidian_powder_from_small.json | 33 +- .../recipes/obsidian_pressure_plate.json | 29 +- .../data/basemetals/recipes/obsidian_rod.json | 33 +- .../basemetals/recipes/obsidian_scythe.json | 37 +- .../basemetals/recipes/obsidian_shears.json | 31 +- .../basemetals/recipes/obsidian_shield.json | 37 +- .../basemetals/recipes/obsidian_shovel.json | 37 +- .../basemetals/recipes/obsidian_slab.json | 31 +- .../recipes/obsidian_smallpowder.json | 25 +- .../basemetals/recipes/obsidian_stairs.json | 35 +- .../basemetals/recipes/obsidian_sword.json | 37 +- .../basemetals/recipes/obsidian_trapdoor.json | 31 +- .../basemetals/recipes/obsidian_wall.json | 33 +- .../data/basemetals/recipes/pewter_arrow.json | 43 +- .../data/basemetals/recipes/pewter_axe.json | 37 +- .../data/basemetals/recipes/pewter_bars.json | 33 +- .../basemetals/recipes/pewter_bars_2.json | 31 +- .../data/basemetals/recipes/pewter_blend.json | 35 +- .../recipes/pewter_blend_from_small.json | 33 +- .../data/basemetals/recipes/pewter_block.json | 33 +- .../recipes/pewter_block_ingot.json | 25 +- .../data/basemetals/recipes/pewter_bolt.json | 39 +- .../data/basemetals/recipes/pewter_boots.json | 31 +- .../data/basemetals/recipes/pewter_bow.json | 37 +- .../basemetals/recipes/pewter_button.json | 31 +- .../basemetals/recipes/pewter_chestplate.json | 33 +- .../recipes/pewter_crackhammer.json | 37 +- .../basemetals/recipes/pewter_crossbow.json | 41 +- .../data/basemetals/recipes/pewter_door.json | 35 +- .../basemetals/recipes/pewter_fishingrod.json | 37 +- .../data/basemetals/recipes/pewter_gear.json | 39 +- .../basemetals/recipes/pewter_helmet.json | 31 +- .../data/basemetals/recipes/pewter_hoe.json | 37 +- .../basemetals/recipes/pewter_horsearmor.json | 37 +- .../recipes/pewter_ingot_from_nuggets.json | 33 +- .../basemetals/recipes/pewter_leggings.json | 33 +- .../data/basemetals/recipes/pewter_lever.json | 35 +- .../basemetals/recipes/pewter_nuggets.json | 25 +- .../basemetals/recipes/pewter_pickaxe.json | 37 +- .../data/basemetals/recipes/pewter_plate.json | 31 +- .../recipes/pewter_powder_from_small.json | 33 +- .../recipes/pewter_pressure_plate.json | 29 +- .../data/basemetals/recipes/pewter_rod.json | 33 +- .../basemetals/recipes/pewter_scythe.json | 37 +- .../basemetals/recipes/pewter_shears.json | 31 +- .../basemetals/recipes/pewter_shield.json | 37 +- .../basemetals/recipes/pewter_shovel.json | 37 +- .../data/basemetals/recipes/pewter_slab.json | 31 +- .../basemetals/recipes/pewter_smallblend.json | 25 +- .../recipes/pewter_smallpowder.json | 25 +- .../basemetals/recipes/pewter_stairs.json | 35 +- .../data/basemetals/recipes/pewter_sword.json | 37 +- .../basemetals/recipes/pewter_trapdoor.json | 31 +- .../data/basemetals/recipes/pewter_wall.json | 33 +- .../data/basemetals/recipes/piston.json | 47 +- .../basemetals/recipes/platinum_arrow.json | 43 +- .../data/basemetals/recipes/platinum_axe.json | 37 +- .../basemetals/recipes/platinum_bars.json | 33 +- .../basemetals/recipes/platinum_bars_2.json | 31 +- .../basemetals/recipes/platinum_block.json | 33 +- .../recipes/platinum_block_ingot.json | 25 +- .../basemetals/recipes/platinum_bolt.json | 39 +- .../basemetals/recipes/platinum_boots.json | 31 +- .../data/basemetals/recipes/platinum_bow.json | 37 +- .../basemetals/recipes/platinum_button.json | 31 +- .../recipes/platinum_chestplate.json | 33 +- .../recipes/platinum_crackhammer.json | 37 +- .../basemetals/recipes/platinum_crossbow.json | 41 +- .../basemetals/recipes/platinum_door.json | 35 +- .../recipes/platinum_fishingrod.json | 37 +- .../basemetals/recipes/platinum_gear.json | 39 +- .../basemetals/recipes/platinum_helmet.json | 31 +- .../data/basemetals/recipes/platinum_hoe.json | 37 +- .../recipes/platinum_horsearmor.json | 37 +- .../recipes/platinum_ingot_from_nuggets.json | 33 +- .../basemetals/recipes/platinum_leggings.json | 33 +- .../basemetals/recipes/platinum_lever.json | 35 +- .../basemetals/recipes/platinum_nuggets.json | 25 +- .../basemetals/recipes/platinum_pickaxe.json | 37 +- .../basemetals/recipes/platinum_plate.json | 31 +- .../recipes/platinum_powder_from_small.json | 33 +- .../recipes/platinum_pressure_plate.json | 29 +- .../data/basemetals/recipes/platinum_rod.json | 33 +- .../basemetals/recipes/platinum_scythe.json | 37 +- .../basemetals/recipes/platinum_shears.json | 31 +- .../basemetals/recipes/platinum_shield.json | 37 +- .../basemetals/recipes/platinum_shovel.json | 37 +- .../basemetals/recipes/platinum_slab.json | 31 +- .../recipes/platinum_smallpowder.json | 25 +- .../basemetals/recipes/platinum_stairs.json | 35 +- .../basemetals/recipes/platinum_sword.json | 37 +- .../basemetals/recipes/platinum_trapdoor.json | 31 +- .../basemetals/recipes/platinum_wall.json | 33 +- .../data/basemetals/recipes/quartz_arrow.json | 43 +- .../data/basemetals/recipes/quartz_axe.json | 37 +- .../data/basemetals/recipes/quartz_bars.json | 33 +- .../basemetals/recipes/quartz_bars_2.json | 31 +- .../data/basemetals/recipes/quartz_bolt.json | 39 +- .../data/basemetals/recipes/quartz_boots.json | 31 +- .../data/basemetals/recipes/quartz_bow.json | 37 +- .../basemetals/recipes/quartz_button.json | 31 +- .../basemetals/recipes/quartz_chestplate.json | 33 +- .../recipes/quartz_crackhammer.json | 37 +- .../basemetals/recipes/quartz_crossbow.json | 41 +- .../data/basemetals/recipes/quartz_door.json | 35 +- .../basemetals/recipes/quartz_fishingrod.json | 37 +- .../data/basemetals/recipes/quartz_gear.json | 39 +- .../basemetals/recipes/quartz_helmet.json | 31 +- .../data/basemetals/recipes/quartz_hoe.json | 37 +- .../basemetals/recipes/quartz_horsearmor.json | 37 +- .../data/basemetals/recipes/quartz_ingot.json | 33 +- .../basemetals/recipes/quartz_leggings.json | 33 +- .../data/basemetals/recipes/quartz_lever.json | 35 +- .../basemetals/recipes/quartz_nugget.json | 25 +- .../basemetals/recipes/quartz_pickaxe.json | 37 +- .../recipes/quartz_powder_from_small.json | 33 +- .../recipes/quartz_pressure_plate.json | 29 +- .../data/basemetals/recipes/quartz_rod.json | 33 +- .../basemetals/recipes/quartz_scythe.json | 37 +- .../basemetals/recipes/quartz_shears.json | 31 +- .../basemetals/recipes/quartz_shield.json | 37 +- .../basemetals/recipes/quartz_shovel.json | 37 +- .../recipes/quartz_smallpowder.json | 25 +- .../data/basemetals/recipes/quartz_sword.json | 37 +- .../basemetals/recipes/quartz_trapdoor.json | 31 +- .../data/basemetals/recipes/quartz_wall.json | 33 +- .../data/basemetals/recipes/rail.json | 39 +- .../recipes/redstone_from_smallpowder.json | 33 +- .../recipes/redstone_smallpowder.json | 25 +- .../data/basemetals/recipes/silver_arrow.json | 43 +- .../data/basemetals/recipes/silver_axe.json | 37 +- .../data/basemetals/recipes/silver_bars.json | 33 +- .../basemetals/recipes/silver_bars_2.json | 31 +- .../data/basemetals/recipes/silver_block.json | 33 +- .../recipes/silver_block_ingot.json | 25 +- .../data/basemetals/recipes/silver_bolt.json | 39 +- .../data/basemetals/recipes/silver_boots.json | 31 +- .../data/basemetals/recipes/silver_bow.json | 37 +- .../basemetals/recipes/silver_button.json | 31 +- .../basemetals/recipes/silver_chestplate.json | 33 +- .../recipes/silver_crackhammer.json | 37 +- .../basemetals/recipes/silver_crossbow.json | 41 +- .../data/basemetals/recipes/silver_door.json | 35 +- .../basemetals/recipes/silver_fishingrod.json | 37 +- .../data/basemetals/recipes/silver_gear.json | 39 +- .../basemetals/recipes/silver_helmet.json | 31 +- .../data/basemetals/recipes/silver_hoe.json | 37 +- .../basemetals/recipes/silver_horsearmor.json | 37 +- .../recipes/silver_ingot_from_nuggets.json | 33 +- .../basemetals/recipes/silver_leggings.json | 33 +- .../data/basemetals/recipes/silver_lever.json | 35 +- .../basemetals/recipes/silver_nuggets.json | 25 +- .../basemetals/recipes/silver_pickaxe.json | 37 +- .../data/basemetals/recipes/silver_plate.json | 31 +- .../recipes/silver_powder_from_small.json | 33 +- .../recipes/silver_pressure_plate.json | 29 +- .../data/basemetals/recipes/silver_rod.json | 33 +- .../basemetals/recipes/silver_scythe.json | 37 +- .../basemetals/recipes/silver_shears.json | 31 +- .../basemetals/recipes/silver_shield.json | 37 +- .../basemetals/recipes/silver_shovel.json | 37 +- .../data/basemetals/recipes/silver_slab.json | 31 +- .../recipes/silver_smallpowder.json | 25 +- .../basemetals/recipes/silver_stairs.json | 35 +- .../data/basemetals/recipes/silver_sword.json | 37 +- .../basemetals/recipes/silver_trapdoor.json | 31 +- .../data/basemetals/recipes/silver_wall.json | 33 +- .../basemetals/recipes/starsteel_arrow.json | 43 +- .../basemetals/recipes/starsteel_axe.json | 37 +- .../basemetals/recipes/starsteel_bars.json | 33 +- .../basemetals/recipes/starsteel_bars_2.json | 31 +- .../basemetals/recipes/starsteel_block.json | 33 +- .../recipes/starsteel_block_ingot.json | 25 +- .../basemetals/recipes/starsteel_bolt.json | 39 +- .../basemetals/recipes/starsteel_boots.json | 31 +- .../basemetals/recipes/starsteel_bow.json | 37 +- .../basemetals/recipes/starsteel_button.json | 31 +- .../recipes/starsteel_chestplate.json | 33 +- .../recipes/starsteel_crackhammer.json | 37 +- .../recipes/starsteel_crossbow.json | 41 +- .../basemetals/recipes/starsteel_door.json | 35 +- .../recipes/starsteel_fishingrod.json | 37 +- .../basemetals/recipes/starsteel_gear.json | 39 +- .../basemetals/recipes/starsteel_helmet.json | 31 +- .../basemetals/recipes/starsteel_hoe.json | 37 +- .../recipes/starsteel_horsearmor.json | 37 +- .../recipes/starsteel_ingot_from_nuggets.json | 33 +- .../recipes/starsteel_leggings.json | 33 +- .../basemetals/recipes/starsteel_lever.json | 35 +- .../basemetals/recipes/starsteel_nuggets.json | 25 +- .../basemetals/recipes/starsteel_pickaxe.json | 37 +- .../basemetals/recipes/starsteel_plate.json | 31 +- .../recipes/starsteel_powder_from_small.json | 33 +- .../recipes/starsteel_pressure_plate.json | 29 +- .../basemetals/recipes/starsteel_rod.json | 33 +- .../basemetals/recipes/starsteel_scythe.json | 37 +- .../basemetals/recipes/starsteel_shears.json | 31 +- .../basemetals/recipes/starsteel_shield.json | 37 +- .../basemetals/recipes/starsteel_shovel.json | 37 +- .../basemetals/recipes/starsteel_slab.json | 31 +- .../recipes/starsteel_smallpowder.json | 25 +- .../basemetals/recipes/starsteel_stairs.json | 35 +- .../basemetals/recipes/starsteel_sword.json | 37 +- .../recipes/starsteel_trapdoor.json | 31 +- .../basemetals/recipes/starsteel_wall.json | 33 +- .../data/basemetals/recipes/steel_anvil.json | 37 +- .../data/basemetals/recipes/steel_arrow.json | 43 +- .../data/basemetals/recipes/steel_axe.json | 37 +- .../data/basemetals/recipes/steel_bars.json | 33 +- .../data/basemetals/recipes/steel_bars_2.json | 31 +- .../data/basemetals/recipes/steel_blend.json | 73 +-- .../recipes/steel_blend_from_small.json | 33 +- .../data/basemetals/recipes/steel_block.json | 33 +- .../basemetals/recipes/steel_block_ingot.json | 25 +- .../data/basemetals/recipes/steel_bolt.json | 39 +- .../data/basemetals/recipes/steel_boots.json | 31 +- .../data/basemetals/recipes/steel_bow.json | 37 +- .../data/basemetals/recipes/steel_button.json | 31 +- .../basemetals/recipes/steel_chestplate.json | 33 +- .../basemetals/recipes/steel_crackhammer.json | 37 +- .../basemetals/recipes/steel_crossbow.json | 41 +- .../data/basemetals/recipes/steel_door.json | 35 +- .../basemetals/recipes/steel_fishingrod.json | 37 +- .../data/basemetals/recipes/steel_gear.json | 39 +- .../data/basemetals/recipes/steel_helmet.json | 31 +- .../data/basemetals/recipes/steel_hoe.json | 37 +- .../basemetals/recipes/steel_horsearmor.json | 37 +- .../recipes/steel_ingot_from_nuggets.json | 33 +- .../basemetals/recipes/steel_leggings.json | 33 +- .../data/basemetals/recipes/steel_lever.json | 35 +- .../basemetals/recipes/steel_nuggets.json | 25 +- .../basemetals/recipes/steel_pickaxe.json | 37 +- .../data/basemetals/recipes/steel_plate.json | 31 +- .../recipes/steel_powder_from_small.json | 33 +- .../recipes/steel_pressure_plate.json | 29 +- .../data/basemetals/recipes/steel_rod.json | 33 +- .../data/basemetals/recipes/steel_scythe.json | 37 +- .../data/basemetals/recipes/steel_shears.json | 31 +- .../data/basemetals/recipes/steel_shield.json | 37 +- .../data/basemetals/recipes/steel_shovel.json | 37 +- .../data/basemetals/recipes/steel_slab.json | 31 +- .../basemetals/recipes/steel_smallblend.json | 25 +- .../basemetals/recipes/steel_smallpowder.json | 25 +- .../data/basemetals/recipes/steel_stairs.json | 35 +- .../data/basemetals/recipes/steel_sword.json | 37 +- .../basemetals/recipes/steel_trapdoor.json | 31 +- .../data/basemetals/recipes/steel_wall.json | 33 +- .../data/basemetals/recipes/stone_anvil.json | 41 +- .../basemetals/recipes/stone_crackhammer.json | 37 +- .../data/basemetals/recipes/stone_scythe.json | 37 +- .../data/basemetals/recipes/tin_arrow.json | 43 +- .../data/basemetals/recipes/tin_axe.json | 37 +- .../data/basemetals/recipes/tin_bars.json | 33 +- .../data/basemetals/recipes/tin_bars_2.json | 31 +- .../data/basemetals/recipes/tin_block.json | 33 +- .../basemetals/recipes/tin_block_ingot.json | 25 +- .../data/basemetals/recipes/tin_bolt.json | 39 +- .../data/basemetals/recipes/tin_boots.json | 31 +- .../data/basemetals/recipes/tin_bow.json | 37 +- .../data/basemetals/recipes/tin_button.json | 31 +- .../basemetals/recipes/tin_chestplate.json | 33 +- .../basemetals/recipes/tin_crackhammer.json | 37 +- .../data/basemetals/recipes/tin_crossbow.json | 41 +- .../data/basemetals/recipes/tin_door.json | 35 +- .../basemetals/recipes/tin_fishingrod.json | 37 +- .../data/basemetals/recipes/tin_gear.json | 39 +- .../data/basemetals/recipes/tin_helmet.json | 31 +- .../data/basemetals/recipes/tin_hoe.json | 37 +- .../basemetals/recipes/tin_horsearmor.json | 37 +- .../recipes/tin_ingot_from_nuggets.json | 33 +- .../data/basemetals/recipes/tin_leggings.json | 33 +- .../data/basemetals/recipes/tin_lever.json | 35 +- .../data/basemetals/recipes/tin_nuggets.json | 25 +- .../data/basemetals/recipes/tin_pickaxe.json | 37 +- .../data/basemetals/recipes/tin_plate.json | 31 +- .../recipes/tin_powder_from_small.json | 33 +- .../recipes/tin_pressure_plate.json | 29 +- .../data/basemetals/recipes/tin_rod.json | 33 +- .../data/basemetals/recipes/tin_scythe.json | 37 +- .../data/basemetals/recipes/tin_shears.json | 31 +- .../data/basemetals/recipes/tin_shield.json | 37 +- .../data/basemetals/recipes/tin_shovel.json | 37 +- .../data/basemetals/recipes/tin_slab.json | 31 +- .../basemetals/recipes/tin_smallpowder.json | 25 +- .../data/basemetals/recipes/tin_stairs.json | 35 +- .../data/basemetals/recipes/tin_sword.json | 37 +- .../data/basemetals/recipes/tin_trapdoor.json | 31 +- .../data/basemetals/recipes/tin_wall.json | 33 +- .../basemetals/recipes/tripwire_hook.json | 41 +- .../basemetals/recipes/wood_crackhammer.json | 37 +- .../data/basemetals/recipes/wood_scythe.json | 37 +- .../data/basemetals/recipes/zinc_arrow.json | 43 +- .../data/basemetals/recipes/zinc_axe.json | 37 +- .../data/basemetals/recipes/zinc_bars.json | 33 +- .../data/basemetals/recipes/zinc_bars_2.json | 31 +- .../data/basemetals/recipes/zinc_block.json | 33 +- .../basemetals/recipes/zinc_block_ingot.json | 25 +- .../data/basemetals/recipes/zinc_bolt.json | 39 +- .../data/basemetals/recipes/zinc_boots.json | 31 +- .../data/basemetals/recipes/zinc_bow.json | 37 +- .../data/basemetals/recipes/zinc_button.json | 31 +- .../basemetals/recipes/zinc_chestplate.json | 33 +- .../basemetals/recipes/zinc_crackhammer.json | 37 +- .../basemetals/recipes/zinc_crossbow.json | 41 +- .../data/basemetals/recipes/zinc_door.json | 35 +- .../basemetals/recipes/zinc_fishingrod.json | 37 +- .../data/basemetals/recipes/zinc_gear.json | 39 +- .../data/basemetals/recipes/zinc_helmet.json | 31 +- .../data/basemetals/recipes/zinc_hoe.json | 37 +- .../basemetals/recipes/zinc_horsearmor.json | 37 +- .../recipes/zinc_ingot_from_nuggets.json | 33 +- .../basemetals/recipes/zinc_leggings.json | 33 +- .../data/basemetals/recipes/zinc_lever.json | 35 +- .../data/basemetals/recipes/zinc_nuggets.json | 25 +- .../data/basemetals/recipes/zinc_pickaxe.json | 37 +- .../data/basemetals/recipes/zinc_plate.json | 31 +- .../recipes/zinc_powder_from_small.json | 33 +- .../recipes/zinc_pressure_plate.json | 29 +- .../data/basemetals/recipes/zinc_rod.json | 33 +- .../data/basemetals/recipes/zinc_scythe.json | 37 +- .../data/basemetals/recipes/zinc_shears.json | 31 +- .../data/basemetals/recipes/zinc_shield.json | 37 +- .../data/basemetals/recipes/zinc_shovel.json | 37 +- .../data/basemetals/recipes/zinc_slab.json | 31 +- .../basemetals/recipes/zinc_smallpowder.json | 25 +- .../data/basemetals/recipes/zinc_stairs.json | 35 +- .../data/basemetals/recipes/zinc_sword.json | 37 +- .../basemetals/recipes/zinc_trapdoor.json | 31 +- .../data/basemetals/recipes/zinc_wall.json | 33 +- .../data/basemetals/registry_manifest.json | 2 + .../testmod/BaseMetalsRuntimeProbe.java | 119 ++++- .../basemetals/testmod/ContentModeChecks.java | 204 ++++++++ .../zone/moddev/mc/basemetals/BaseMetals.java | 7 + .../mc/basemetals/BaseMetalsEvents.java | 25 + .../client/BaseMetalsConfigScreen.java | 157 ++++++ .../client/ClientMoltenMetalRenderer.java | 2 +- .../mc/basemetals/client/ClientSetup.java | 7 + .../client/ModsListConfigButton.java | 51 ++ .../basemetals/config/BaseMetalsConfig.java | 48 +- .../mc/basemetals/config/ConfigEdits.java | 43 ++ .../mc/basemetals/config/ContentMode.java | 38 ++ .../mc/basemetals/config/ContentPolicy.java | 93 ++++ .../mc/basemetals/config/MaterialForm.java | 31 ++ .../basemetals/content/BaseMetalAmmoItem.java | 2 +- .../content/BaseMetalAnvilBlock.java | 2 +- .../content/CompatibilityDoubleSlabBlock.java | 2 +- .../mc/basemetals/content/MoltenFluid.java | 2 +- .../mc/basemetals/entity/ModEntities.java | 2 +- .../loot/ContentModeLootCondition.java | 41 ++ .../moddev/mc/basemetals/loot/ModLoot.java | 2 +- .../migration/LegacyWorldDataHook.java | 11 +- .../network/ContentModeNetwork.java | 112 ++++ .../recipe/ContentCraftingRecipe.java | 127 +++++ .../mc/basemetals/recipe/CrushingRecipe.java | 5 +- .../recipe/LegacySmeltingRecipe.java | 19 +- .../basemetals/recipe/PlateRepairRecipe.java | 2 + .../mc/basemetals/trade/BaseMetalsTrades.java | 4 +- src/main/resources/META-INF/mods.toml | 4 +- .../models/block/adamantine_ore.json | 86 +++- .../basemetals/models/block/antimony_ore.json | 86 +++- .../basemetals/models/block/bismuth_ore.json | 86 +++- .../basemetals/models/block/coldiron_ore.json | 86 +++- .../basemetals/models/block/copper_ore.json | 86 +++- .../basemetals/models/block/lead_ore.json | 86 +++- .../basemetals/models/block/mercury_ore.json | 86 +++- .../basemetals/models/block/nickel_ore.json | 86 +++- .../basemetals/models/block/platinum_ore.json | 86 +++- .../basemetals/models/block/silver_ore.json | 86 +++- .../models/block/starsteel_ore.json | 86 +++- .../basemetals/models/block/tin_ore.json | 86 +++- .../basemetals/models/block/zinc_ore.json | 86 +++- .../ore_overlays/adamantine_ore.png | Bin .../{ => block}/ore_overlays/antimony_ore.png | Bin .../{ => block}/ore_overlays/bismuth_ore.png | Bin .../{ => block}/ore_overlays/coldiron_ore.png | Bin .../{ => block}/ore_overlays/copper_ore.png | Bin .../ore_overlays/cupronickel_ore.png | Bin .../{ => block}/ore_overlays/lead_ore.png | Bin .../{ => block}/ore_overlays/mercury_ore.png | Bin .../{ => block}/ore_overlays/nickel_ore.png | Bin .../{ => block}/ore_overlays/pewter_ore.png | Bin .../{ => block}/ore_overlays/platinum_ore.png | Bin .../{ => block}/ore_overlays/silver_ore.png | Bin .../ore_overlays/starsteel_ore.png | Bin .../{ => block}/ore_overlays/tin_ore.png | Bin .../{ => block}/ore_overlays/zinc_ore.png | Bin .../basemetals/data/BMBlockStateProvider.java | 29 +- .../config/ContentModeDataTest.java | 133 +++++ .../basemetals/config/ContentPolicyTest.java | 100 ++++ .../basemetals/data/OreOverlayModelTest.java | 62 +++ .../mc/basemetals/data/PlayerTextTest.java | 98 ++++ .../basemetals/data/RecipeRegressionTest.java | 65 ++- .../data/ResourceIntegrityTest.java | 6 +- .../content/high_fantasy_acquisition.json | 11 + tools/config_translations.json | 266 ++++++++++ tools/gen_recipes.js | 7 +- tools/generate_113_resources.js | 83 ++- tools/player_translations.json | 246 +++++++++ tools/test_content_modes.js | 163 ++++++ tools/validation/legacy-capture/README.md | 63 +++ tools/validation/legacy-capture/build.gradle | 42 ++ .../validation/legacy-capture/settings.gradle | 12 + .../mcmoddev/validation/LegacyCapture.java | 417 +++++++++++++++ .../src/main/resources/mcmod.info | 1 + tools/validation/test_legacy_worlds.js | 112 ++++ 2165 files changed, 39580 insertions(+), 16991 deletions(-) create mode 100644 docs/CONTENT_MODES.md create mode 100644 src/integrationTest/java/zone/moddev/mc/basemetals/testmod/ContentModeChecks.java create mode 100644 src/main/java/zone/moddev/mc/basemetals/client/BaseMetalsConfigScreen.java create mode 100644 src/main/java/zone/moddev/mc/basemetals/client/ModsListConfigButton.java create mode 100644 src/main/java/zone/moddev/mc/basemetals/config/ConfigEdits.java create mode 100644 src/main/java/zone/moddev/mc/basemetals/config/ContentMode.java create mode 100644 src/main/java/zone/moddev/mc/basemetals/config/ContentPolicy.java create mode 100644 src/main/java/zone/moddev/mc/basemetals/config/MaterialForm.java create mode 100644 src/main/java/zone/moddev/mc/basemetals/loot/ContentModeLootCondition.java create mode 100644 src/main/java/zone/moddev/mc/basemetals/network/ContentModeNetwork.java create mode 100644 src/main/java/zone/moddev/mc/basemetals/recipe/ContentCraftingRecipe.java rename src/main/resources/assets/basemetals/textures/{ => block}/ore_overlays/adamantine_ore.png (100%) rename src/main/resources/assets/basemetals/textures/{ => block}/ore_overlays/antimony_ore.png (100%) rename src/main/resources/assets/basemetals/textures/{ => block}/ore_overlays/bismuth_ore.png (100%) rename src/main/resources/assets/basemetals/textures/{ => block}/ore_overlays/coldiron_ore.png (100%) rename src/main/resources/assets/basemetals/textures/{ => block}/ore_overlays/copper_ore.png (100%) rename src/main/resources/assets/basemetals/textures/{ => block}/ore_overlays/cupronickel_ore.png (100%) rename src/main/resources/assets/basemetals/textures/{ => block}/ore_overlays/lead_ore.png (100%) rename src/main/resources/assets/basemetals/textures/{ => block}/ore_overlays/mercury_ore.png (100%) rename src/main/resources/assets/basemetals/textures/{ => block}/ore_overlays/nickel_ore.png (100%) rename src/main/resources/assets/basemetals/textures/{ => block}/ore_overlays/pewter_ore.png (100%) rename src/main/resources/assets/basemetals/textures/{ => block}/ore_overlays/platinum_ore.png (100%) rename src/main/resources/assets/basemetals/textures/{ => block}/ore_overlays/silver_ore.png (100%) rename src/main/resources/assets/basemetals/textures/{ => block}/ore_overlays/starsteel_ore.png (100%) rename src/main/resources/assets/basemetals/textures/{ => block}/ore_overlays/tin_ore.png (100%) rename src/main/resources/assets/basemetals/textures/{ => block}/ore_overlays/zinc_ore.png (100%) create mode 100644 src/test/java/zone/moddev/mc/basemetals/config/ContentModeDataTest.java create mode 100644 src/test/java/zone/moddev/mc/basemetals/config/ContentPolicyTest.java create mode 100644 src/test/java/zone/moddev/mc/basemetals/data/PlayerTextTest.java create mode 100644 src/test/resources/content/high_fantasy_acquisition.json create mode 100644 tools/config_translations.json create mode 100644 tools/player_translations.json create mode 100644 tools/test_content_modes.js create mode 100644 tools/validation/legacy-capture/README.md create mode 100644 tools/validation/legacy-capture/build.gradle create mode 100644 tools/validation/legacy-capture/settings.gradle create mode 100644 tools/validation/legacy-capture/src/main/java/com/mcmoddev/validation/LegacyCapture.java create mode 100644 tools/validation/legacy-capture/src/main/resources/mcmod.info create mode 100644 tools/validation/test_legacy_worlds.js diff --git a/.gitattributes b/.gitattributes index df36b4f1..f6833076 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,5 +3,6 @@ # are changed when only line endings change. src/generated/**/.cache/cache text eol=lf src/generated/**/*.json text eol=lf +src/main/resources/assets/basemetals/models/block/*_ore.json text eol=lf /gradlew text eol=lf /gradlew.bat text eol=lf diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0311ecc5..714ba476 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -130,7 +130,7 @@ jobs: set -euo pipefail chmod +x ./gradlew gradle_args=( - clean check build javadoc verifyReleaseArtifacts writeReleaseChecksums + clean verifyGeneratedOreModels check build javadoc verifyReleaseArtifacts writeReleaseChecksums verifyEclipseProductionClasspath -PorespawnVerificationRepository="${{ steps.orespawn.outputs.repository }}" --no-daemon --stacktrace --max-workers=2 diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 4aad869f..2cfc395a 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,8 +1,29 @@ Base Metals 3.0.1.113021 +- Add the configuration screen to Forge's Mods list and OreSpawn's cog, with + translated labels and help in all 18 language files. +- Enable the Mods-list Config button when Base Metals is selected. Forge 1.13 + leaves it disabled even when a configuration screen is registered. +- Rewrite settings help and equipment tooltips in plain language. Clarify + armour bonuses and Starsteel self-repair, and correct the Pewter, Aquarium + and Steel advancement hints. +- Bring High Fantasy and Low Fantasy modes forward from 1.12. Old configs + default to High Fantasy; existing items, saved equipment and ore generation + stay unchanged. Low Fantasy restricts crafting, plate repairs, shield + upgrades, new villager trades and chest loot to the allowed items. +- Check the client and server's content modes during login, with a clear + message when they differ. Mode changes take effect after a restart and + apply to the installation, not individual worlds. +- Restore earned recipe-book unlocks when returning from Low Fantasy to High + Fantasy, without resetting advancement progress. +- Restore 1.12 recipe discovery: one ingot reveals a metal's crafting recipes, + without first making rods or plates. Vanilla materials use their usual + gems, coal, charcoal, redstone, stone or logs. Low Fantasy still hides + restricted recipes, and existing recipe-book progress is kept. - Add support for Kiri's ore overlays on vanilla host textures, including resource pack replacements. Ores keep their original texture when no overlay is available. +- Update ore model JSONs automatically during builds and Eclipse Gradle refreshes. - Fix Gradle game launches so Forge prepares the assets and native libraries. Allow newer Java 8 updates for development while keeping release builds pinned. - Bring the 1.18.2 port to Minecraft 1.13.2 and Forge 25.0.223, running on Java 8. @@ -28,8 +49,9 @@ Fixes carried forward from the 1.12 release - Plate repairs preserve the original item's name, enchantments and other NBT, and reject incomplete recipes and extra ingredients. They stay out of the recipe book. -- Crafting recipes unlock from matching ingredients, including Forge tags. - Recipe-book groups are specific to the resulting item. +- Crafting recipes unlock when you find the material or matching ingredients, + including ingredients from Forge tags. Recipe-book groups are specific to + the resulting item. - Nine Obsidian nuggets produce an ingot, not a block. Obsidian blocks use nine ingots, with a pattern distinct from bars and doors. Vanilla Bits swords and bolts no longer cost less material than their recycling recipes return. diff --git a/README.md b/README.md index af99b1e4..748f93eb 100644 --- a/README.md +++ b/README.md @@ -10,19 +10,19 @@ to Minecraft. Depending on the material, these are available as ores, storage and decorative blocks, molten fluids, crafting components, tools, armour, shields, bows, crossbows, arrows, and bolts. The mod also includes Crack Hammers, scythes, metal anvils, the human detector, villager trades, -advancements, and structure loot. +advancements, and extra loot to find in chests. This is the Minecraft 1.13.2 version, `3.0.1.113021`, adapted from the 1.18.2 port. It keeps the historical `basemetals` block and item IDs, but no longer -needs MMDLib or Additional Loot Tables. Forge handles registration, recipes, -loot and advancements, and OreSpawn handles ore placement. +needs MMDLib or Additional Loot Tables. OreSpawn places the ores, and Base +Metals supplies the metals and their recipes. ## Requirements - Minecraft `1.13.2` - Forge `25.0.223` - Java 8 -- OreSpawn `[4.0.16.113021,5.0.0)` on both client and server +- OreSpawn `[4.1.0.113021,5.0.0)` on both client and server Put `BaseMetals-3.0.1.113021.jar` and OreSpawn `4.1.0.113021` (or a later compatible OreSpawn 4 build for 1.13.2) in the `mods` directory. MMDLib and @@ -43,16 +43,16 @@ can be used together. Notable mechanics include: -- Crack Hammers crush supported mined blocks through the data-driven - `basemetals:crushing` recipe type. They can also crush dropped items by using - the hammer on the block beneath them; sneaking processes as much of a stack - as the hammer's remaining durability allows. +- Crack Hammers crush ores and other supported blocks as you mine them. They + can also crush dropped items by using the hammer on the block beneath them; + sneaking processes as much of a stack as the hammer's remaining durability + allows. - Supported ore powders can be smelted into ingots, and alloy blends provide the historical furnace-based alloying route. -- Scythes harvest a horizontal 3x3 area while respecting Forge block-break and - protection events, drops, enchantments, and durability. -- Material shields can be upgraded at an anvil with one strictly harder tagged - plate while retaining their enchantments. +- Scythes harvest plants in a horizontal 3x3 area. They work with enchantments + and land-protection mods, and wear out as you use them. +- Upgrade a shield at an anvil with one plate of a harder metal. The shield + keeps its enchantments. - One damaged armour piece or shield and a matching plate fully repair the item without losing its name, enchantments or other saved data. These repair recipes stay out of the recipe book. @@ -61,17 +61,31 @@ Notable mechanics include: ammunition materials contribute to damage; Power is added afterward. - Configurable armour and melee effects give Adamantine, Aquarium, Cold Iron, Lead, Mithril, and Starsteel their distinctive behaviour. Held Starsteel - equipment repairs by one durability every 200 server ticks; its armour does + equipment repairs by one durability every 10 seconds; its armour does not regenerate. -- Dedicated molten-metal buckets place and collect the corresponding fluid - blocks. They are compatibility resources rather than a second processing - system. - -The common configuration has four default-enabled switches: special equipment -effects, Starsteel regeneration, mercury immersion effects, and villager -trades. These switches do not remove registered items or blocks. Individual -materials and recipes cannot be disabled through this configuration; edit ore -placement through OreSpawn. +- Molten-metal buckets let you place and collect fluids. Base Metals does not + include a smeltery; other mods may provide ways to produce these fluids. + +Open the configuration from the main menu's **Mods → Base Metals → Config** +button, or from the Base Metals cog in OreSpawn's world-creation settings. +Both open the same screen, with Cancel, Undo and Defaults controls. + +Collecting a metal ingot reveals that material's crafting recipes in the recipe +book, as in 1.12. Vanilla-material recipes are discovered through their usual +base materials, such as diamonds, stone or logs. Low Fantasy shows only the +recipes allowed by that mode. + +The four switches, enabled by default, control special equipment effects, +Starsteel self-repair, mercury poisoning and villager trades. The content-mode +selector offers **High Fantasy** (craft freely with every metal) and +**Low Fantasy** (keep fantasy metals, but limit what each material can make). +Mode changes require a restart, and clients and servers must use the same mode. +Old configs without this setting remain in High Fantasy. + +Everything you already own stays usable in either mode, and ore generation +stays the same. Your choice applies to all your worlds; servers choose their +own mode. See [Content modes and configuration](docs/CONTENT_MODES.md) for the +full list of restrictions. Use OreSpawn to change where ores generate. ## Ore generation @@ -88,7 +102,7 @@ generate by default. Base Metals does not add rock strata. If Mineralogy is installed, OreSpawn uses the same rules inside its rock families without generating a second copy of each ore. See [World generation](docs/WORLDGEN.md) for the complete provider -contract. +settings. ## Updating an old world @@ -131,6 +145,12 @@ Run these tasks from IntelliJ's Gradle window or a terminal. ForgeGradle's launcher prepares the assets and native libraries; no manual asset paths are needed. The Gradle JVM should be Java 17, not the Java 8 game runtime. +Ore model JSONs update automatically when you build, launch with `runClient`, +or refresh the Gradle project in Eclipse. Put transparent ore textures under +`src/main/resources/assets/basemetals/textures/block/ore_overlays`; no separate +generation command is needed. Review and commit the updated models with the +textures. CI and release auditing still reject stale models. + With the pinned release toolchain, run the full release checks: ```text @@ -150,11 +170,14 @@ their directories through the `packagedForgeClientRuntime` and release JAR and OreSpawn dependency, create real worlds, validate client models and colours, and remain outside the published artifact. -CI performs an empty-cache Forge bootstrap, contract unit tests, deterministic-data -drift checks, an exact-OreSpawn dedicated-server probe, release-JAR auditing, -checksums, reproducibility checks, CodeQL, wrapper validation, and Eclipse -classpath isolation. Test probes and historical fixtures are excluded from the -published JAR. +`contentModeIntegrationTest` uses the same runtime properties to check both +content modes, old configuration files, client/server matching and mismatch +messages in disposable multiplayer profiles. + +CI checks a fresh Forge setup, unit tests, generated files, a dedicated server +with the pinned OreSpawn release, release-JAR contents, checksums, reproducible +builds, CodeQL, wrapper validation, and Eclipse classpath isolation. Test probes +and historical fixtures are excluded from the published JAR. Development and CI use the published [OreSpawn 4.1.0.113021 release](https://www.curseforge.com/minecraft/mc-mods/mmd-orespawn/files/9035885) diff --git a/build.gradle b/build.gradle index cda3bcb9..3da9c907 100644 --- a/build.gradle +++ b/build.gradle @@ -303,8 +303,14 @@ def verifyLegacyUpgradeRun = tasks.register('verifyLegacyUpgradeRun') { throw new GradleException('Legacy-world runtime probe did not report PASS') } File fixtureManifest = new File(runDirectory, 'world/legacy_registry_manifest_runtime.json') - if (fixtureManifest.isFile() && !text.contains('BASEMETALS_1_12_TO_1_13_UPGRADE PASS')) { - throw new GradleException('Complete 1.12 fixture verification did not report PASS') + if (fixtureManifest.isFile()) { + boolean from110 = new File(runDirectory, + 'world/BASEMETALS_1_10_FIXTURE_COMPLETE.txt').isFile() + String marker = from110 ? 'BASEMETALS_1_10_TO_1_13_UPGRADE PASS' + : 'BASEMETALS_1_12_TO_1_13_UPGRADE PASS' + if (!text.contains(marker)) { + throw new GradleException("Complete ${from110 ? '1.10' : '1.12'} fixture verification did not report PASS") + } } if (!text.contains('legacy Base Metals states') || !text.contains('protected')) { throw new GradleException('Legacy Base Metals registry/chunk preparation was not observed') @@ -348,7 +354,7 @@ repositories { dependencies { implementation minecraft.dependency("net.minecraftforge:forge:${minecraft_version}-${forge_version}") - runtimeOnly renamer.dependency(orespawnCoordinate) + implementation renamer.dependency(orespawnCoordinate) orespawnRelease orespawnCoordinate testImplementation platform('org.junit:junit-bom:5.10.2') testImplementation 'org.junit.jupiter:junit-jupiter' @@ -615,7 +621,7 @@ tasks.register('verifyReleaseArtifacts') { } String modsToml = zip.getInputStream(zip.getEntry('META-INF/mods.toml')).getText('UTF-8') if (modsToml.contains('${') || !modsToml.contains('version="3.0.1.113021"') - || !modsToml.contains('versionRange="[4.0.16.113021,5.0.0)"')) { + || !modsToml.contains('versionRange="[4.1.0.113021,5.0.0)"')) { throw new GradleException('Release mods.toml contains unresolved or incompatible metadata') } def provider = new JsonSlurper().parse(zip.getInputStream( @@ -730,8 +736,8 @@ def verifyGeneratedData = tasks.register('verifyGeneratedData', Exec) { } } def oreModelsDirectory = file('src/main/resources/assets/basemetals/models/block') -def oreModelSnapshot = { - fileTree(oreModelsDirectory) { include '*_ore.json' }.files.collectEntries { +def oreModelSnapshot = { File directory -> + fileTree(directory) { include '*_ore.json' }.files.collectEntries { [(it.name): sha256(it)] } } @@ -744,20 +750,36 @@ def generateOreModels = tasks.register('generateOreModels', JavaExec) { args file('src/main/resources').absolutePath } tasks.named('processResources') { dependsOn generateOreModels } -def verifyGeneratedOreModels = tasks.register('verifyGeneratedOreModels') { +def oreModelVerificationDirectory = layout.buildDirectory.dir('ore-model-verification') +def verifyGeneratedOreModels = tasks.register('verifyGeneratedOreModels', JavaExec) { group = 'verification' - dependsOn generateOreModels + description = 'Checks the saved ore models without rewriting them.' + dependsOn tasks.named('modelGeneratorClasses') + classpath = sourceSets.modelGenerator.runtimeClasspath + mainClass = 'zone.moddev.mc.basemetals.data.BMBlockStateProvider' + args file('src/main/resources').absolutePath, '--output', oreModelVerificationDirectory.get().asFile.absolutePath + + doFirst { + File output = oreModelVerificationDirectory.get().asFile.canonicalFile + File buildDirectory = layout.buildDirectory.get().asFile.canonicalFile + if (!output.toPath().startsWith(buildDirectory.toPath()) || output.name != 'ore-model-verification') { + throw new GradleException("Unsafe ore-model verification directory: ${output}") + } + delete output + } doLast { - if (generateOreModels.get().beforeGeneration != oreModelSnapshot()) { - throw new GradleException('Ore models were stale. Review and commit the generateOreModels output.') + File expectedModels = new File(oreModelVerificationDirectory.get().asFile, 'assets/basemetals/models/block') + if (oreModelSnapshot(oreModelsDirectory) != oreModelSnapshot(expectedModels)) { + throw new GradleException('Ore models are stale. Build the project and commit the updated JSON files.') } } } -generateOreModels.configure { doFirst { ext.beforeGeneration = oreModelSnapshot() } } +// Release checks must see stale models before the normal build updates them. +generateOreModels.configure { mustRunAfter verifyGeneratedOreModels } +tasks.named('verifyReleaseArtifacts') { dependsOn verifyGeneratedOreModels } tasks.named('check') { dependsOn tasks.named('verifyDevelopmentLaunches') dependsOn verifyGeneratedData - dependsOn verifyGeneratedOreModels dependsOn tasks.named('verifyReleaseConfiguration') dependsOn tasks.named('verifyReleaseDependencies') dependsOn tasks.named('verifyMavenCoordinates') @@ -776,7 +798,7 @@ eclipse { }.each { entry -> entry.entryAttributes['test'] = 'true' } } } - synchronizationTasks 'isolateEclipseProductionRuns' + synchronizationTasks generateOreModels, 'isolateEclipseProductionRuns' } idea { module { @@ -897,6 +919,13 @@ tasks.register('verifyEclipseProductionClasspath') { dependsOn tasks.named('eclipseClasspath') dependsOn tasks.named('isolateEclipseProductionRuns') doLast { + Set synchronizationTasks = eclipse.synchronizationTasks.getDependencies(delegate).collect { + it.name + } as Set + if (!synchronizationTasks.contains('generateOreModels')) { + throw new GradleException('Eclipse Gradle refresh must regenerate ore models') + } + File prefs = file('.settings/org.eclipse.buildship.core.prefs') Properties buildshipPreferences = new Properties() prefs.withInputStream { buildshipPreferences.load(it) } @@ -1248,3 +1277,27 @@ tasks.register('packagedRuntimeIntegrationTest') { dependsOn tasks.named('packagedServerIntegrationTest') dependsOn tasks.named('packagedClientIntegrationTest') } + +tasks.register('contentModeIntegrationTest', Exec) { + group = 'verification' + description = 'Tests packaged content policies and client/server mode matching with disposable profiles.' + dependsOn releaseJar, packagedServerProbeJar, packagedClientProbeJar + dependsOn tasks.named('verifyReleaseDependencies') + doFirst { + File root = prepareBuildOwnedRunDirectory(file("${buildDir}/content-mode-tests"), 'content-mode-tests') + File fixture = new File(root, 'fixture') + copy { + from releaseJar, packagedServerProbeJar, packagedClientProbeJar, releasedOreSpawnJar() + into fixture + } + File java = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(8) + vendor = JvmVendorSpec.ADOPTIUM + }.get().executablePath.asFile + commandLine 'node', file('tools/test_content_modes.js').absolutePath, java.absolutePath, + requireRuntimeDirectory(packagedForgeServerRuntime, 'packagedForgeServerRuntime').absolutePath, + requireRuntimeDirectory(packagedForgeClientRuntime, 'packagedForgeClientRuntime').absolutePath, + fixture.absolutePath, root.absolutePath + if (providers.gradleProperty('contentModeCycleOnly').isPresent()) args '--cycle-only' + } +} diff --git a/docs/COMPATIBILITY.md b/docs/COMPATIBILITY.md index cef3f8c9..b08cf602 100644 --- a/docs/COMPATIBILITY.md +++ b/docs/COMPATIBILITY.md @@ -17,5 +17,23 @@ Construct, Ender IO, IC2, Thaumcraft, Dense Ores, VeinMiner, or Constructs Armory. Their version-specific 1.18 data and APIs are not valid on Forge 25. Generic processors and tools can interoperate through Forge tags. -Mineralogy is entirely optional. Base Metals does not link to Mineralogy Java -classes; OreSpawn's rock-family host matching is the only integration point. +Mineralogy is optional. When installed, OreSpawn can place the same ores in +Mineralogy's rocks. Base Metals does not need Mineralogy to run. + +## Changes from the 1.12 release + +The native 1.13 port retains the corrected fuel values, door and trapdoor +recipes, material fishing-rod durability, rail yields, ranged damage and +projectile pickup, armour effects, recipe-book unlocks, plate repairs and the +18 gameplay achievements. High/Low Fantasy and both configuration entry points +are available here too. + +MMDLib's individual material, form, molten-fluid and forced-trait switches do +not have equivalents in this port. Every block and item stays available so a +setting change cannot remove anything from an old save. Use Low Fantasy to +limit what players can make, Forge data packs for custom recipes, +and OreSpawn for ore-generation settings. + +The old Tinkers/TAIGA and other mod-specific fixes are not copied as plugins: +this branch has no corresponding integrations. Historical material aliases +are forwarding Forge tags instead of shared MMDLib material-registry entries. diff --git a/docs/CONTENT_MODES.md b/docs/CONTENT_MODES.md new file mode 100644 index 00000000..30fac0e3 --- /dev/null +++ b/docs/CONTENT_MODES.md @@ -0,0 +1,83 @@ +# Content modes and configuration + +Open **Mods → Base Metals → Config** from the main menu, or click the Base +Metals cog in OreSpawn's world-creation settings. These open the same screen. +Hover over an option for help. Done saves, Cancel or Escape discards edits, +Undo restores the values shown when the screen opened, and Defaults restores +High Fantasy and the four enabled gameplay switches. + +The file is `config/basemetals-common.toml`. Its existing switches keep their +names and defaults: `specialEffects`, `starsteelRegeneration`, +`mercuryImmersionEffects` and `villagerTrades`. Those switches can change live. +`contentMode` is different: changing it requires restarting Minecraft. + +## High Fantasy + +`contentMode = "high_fantasy"` is the default. All normal Base Metals recipes, +villager trades and chest loot remain available. An older 1.13 config without +this setting, or no config file at all, uses High Fantasy automatically. +Unknown mode names fall back to High Fantasy and are corrected in the config. + +Picking up a metal ingot reveals that material's crafting recipes, including +bows and crossbows. You do not need to make rods or plates first. Vanilla-material +recipes use their usual base materials: gems, coal, charcoal, redstone, stone +or logs. Existing recipe-book progress is kept. + +## Low Fantasy + +`contentMode = "low_fantasy"` keeps fantasy metals, but not every material can +be made into every item. For example, you cannot make an Adamantine bow or +Pewter armour. Base Metals bows, crossbows and fishing rods cannot be crafted +or found in its normal villager trades or chest loot. Vanilla Minecraft +equipment and recipes are unchanged. + +The equipment rules are: + +The full tool family includes axes, Crack Hammers, hoes, pickaxes, scythes, +shears, shovels and swords. + +| Material | Tools and melee weapons | +| --- | --- | +| Adamantine, Aquarium, Bronze, Cold Iron, Copper, Cupronickel, Invar, Mithril, Nickel, Starsteel, Steel, Iron | Full tool family | +| Silver | Sword | +| Obsidian | Axe, sword, scythe | +| Diamond | Crack Hammer, scythe, shears | +| Stone | Crack Hammer, scythe | +| Wood | Crack Hammer | +| Other materials | None | + +Armour, shields and horse armour remain available for Adamantine, Aquarium, +Brass, Bronze, Cold Iron, Copper, Cupronickel, Electrum, Invar, Mithril, Nickel, +Platinum, Silver, Starsteel and Steel, plus the Iron, Gold and Diamond additions. +Arrows and bolts remain available for the full-tool materials and Silver, +Obsidian and Diamond. + +Gears remain available for the full-tool materials and Brass, Gold and Wood. +The available anvils are Stone, Steel and Adamantine. Solid materials can still +be made into storage and building blocks. Mercury keeps its ore, powders, liquid, +bucket and the ingot used to make Mithril, but not nuggets, solid construction +forms or equipment. + +These restrictions also apply to plate repairs, shield upgrades, new villager +trades and chest loot. Smelting small Mercury powders will not give Mercury +nuggets. Unavailable recipes stay out of the recipe book. + +If a material earns a recipe advancement in Low Fantasy, returning to High +Fantasy restores that recipe-book unlock when you next join. There is no need +to reset advancements or collect the ingredient again. + +## Servers, modpacks and old saves + +Your choice applies to all worlds you play on this installation. To join a +server, choose the same mode as the server and restart Minecraft. If the modes +differ, the connection screen tells you how to change yours. An old config +without a mode setting counts as High Fantasy. + +Nothing you already own is removed or stops working. That includes bows and +fishing rods you can no longer make in Low Fantasy. All items remain available +in creative mode. Existing villager offers, commands and recipes supplied by +other mods or data packs are left alone. + +Neither mode changes the eleven OreSpawn rules or overwrites a world's ore +profile. Use OreSpawn's editor to change ore placement. This port does not +include the old MMDLib integration plugins or their configuration categories. diff --git a/docs/MIGRATION.md b/docs/MIGRATION.md index 718a8520..0d284173 100644 --- a/docs/MIGRATION.md +++ b/docs/MIGRATION.md @@ -27,7 +27,7 @@ snapshot, Base Metals: Before changing `level.dat`, `level.dat_old`, or a playerdata file, the hook creates a sibling `*.basemetals-legacy-backup` copy. Minecraft converts region chunks normally as they are loaded and saved, so the untouched source world is -the authoritative rollback. Never test an upgrade against the only copy. +your backup if you need to go back. Never test an upgrade against the only copy. Historical IDs retained or forwarded include hidden `double__slab` blocks, legacy molten-fluid block IDs such as @@ -40,6 +40,18 @@ MMD Base Metals releases for Minecraft 1.10.2 and 1.12.2. It is not a downgrade path: do not open a world already saved by Minecraft 1.14 or newer, including the Base Metals 1.18.2 port, in Minecraft 1.13.2. +## Mod settings + +This port uses `config/basemetals-common.toml`. It does not read the old +`BaseMetals.cfg` or `MMDLib.cfg` files. Configure the four gameplay switches +and content mode through Forge's Mods list or the Base Metals cog in OreSpawn. +High Fantasy is the default; if you used Low Fantasy in 1.12, select it again +in the new screen and restart Minecraft. + +The old switches for disabling individual materials are not carried forward. +Blocks and items remain available so old saves still load. Use Low Fantasy to +limit what you can make instead. See [Content modes and configuration](CONTENT_MODES.md). + ## OreSpawn configuration The Base Metals provider uses the historical 1.13.2 defaults documented in diff --git a/docs/VERSIONS.md b/docs/VERSIONS.md index 0d0a3217..fc0ab343 100644 --- a/docs/VERSIONS.md +++ b/docs/VERSIONS.md @@ -8,7 +8,8 @@ Java 8. The Gradle build itself runs on Java `17.0.1+12` and uses ForgeGradle Builds and tests use the published OreSpawn `4.1.0.113021` release (CurseForge project `245586`, file `9035885`, SHA-256 `66C9CC5F8BE8F08F3DD5FA26EBEA79B52972B2FB86CB4DADBEEBC29AC01D3435`). -At runtime, Base Metals requires OreSpawn `[4.0.16.113021,5.0.0)` for Minecraft 1.13.2. +At runtime, Base Metals requires OreSpawn `[4.1.0.113021,5.0.0)` for Minecraft 1.13.2. +The configuration cog uses OreSpawn's public 4.1 client API. Builds download this file through CurseMaven. CI verifies the download and stages it in a temporary Maven repository. The schema-3 provider supports the diff --git a/docs/WORLDGEN.md b/docs/WORLDGEN.md index 7e8946b8..b5fbbc91 100644 --- a/docs/WORLDGEN.md +++ b/docs/WORLDGEN.md @@ -1,6 +1,6 @@ # OreSpawn world generation -Base Metals requires OreSpawn `[4.0.16.113021,5.0.0)` and packages provider +Base Metals requires OreSpawn `[4.1.0.113021,5.0.0)` and packages provider schema 3, revision 1 at `data/basemetals/orespawn/provider.json`. Builds and tests use the published OreSpawn `4.1.0.113021` release. @@ -24,9 +24,9 @@ and `retrogen:false`. | Nickel | all except Nether/End | 32..95 | uniform | 1 | same | | Platinum | all except Nether/End | 1..31 | uniform | 0.125 | same | -Minecraft 1.13.2 has no vanilla copper ore, so the Base Metals copper rule is -enabled by default. Antimony and Bismuth ore blocks are registered for content -and save compatibility but have no default generation rule. +Minecraft 1.13.2 has no vanilla copper ore, so Base Metals copper generates +by default. Antimony and Bismuth ores are available in creative mode and old +saves, but do not generate unless you add rules for them in OreSpawn. The ordinary-dimension selector includes modded dimensions while excluding the Nether and End. Mineralogy rock families are additional hosts, allowing the diff --git a/gradle.properties b/gradle.properties index 46314754..a872d516 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,4 @@ -# Sets default memory used for gradle commands. Can be overridden by user or command line properties. -# This is required to provide enough memory for the Minecraft decompilation process. +# Memory for Forge's build tools. Gradle runs on Java 17; Minecraft runs on Java 8. org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false org.gradle.configuration-cache=false @@ -7,19 +6,13 @@ org.gradle.caching=true org.gradle.parallel=false net.minecraftforge.gradle.merge-source-sets=false - -## Environment Properties - -# The Minecraft version must agree with the Forge version to get a valid artifact +# Minecraft, Forge and mappings must describe the same game version. minecraft_version=1.13.2 -# The Minecraft version range can use any release version of Minecraft as bounds. -# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly -# as they do not follow standard versioning conventions. minecraft_version_range=[1.13.2] -# The Forge version must agree with the Minecraft version to get a valid artifact forge_version=25.0.223 forge_installer_sha256=D46CB326E7DC32695084090C8169BB57F32F1C23B801DDB35A336F252E381191 -# Release metadata consumed by the generic dispatcher. + +# Target and Java versions used by release checks and publishing. loader_name=forge loader_code=1 java_version=8 @@ -27,53 +20,28 @@ java_toolchain_version=8.0.502+7 gradle_java_version=17 curseforge_project_id=240967 -# Exact released OreSpawn used for development and qualification. Runtime -# metadata intentionally remains compatible with supported OreSpawn 4 builds. +# Pin the OreSpawn release we build and test against. orespawn_version=4.1.0.113021 orespawn_curse_project_id=245586 orespawn_curse_file_id=9035885 orespawn_sha256=66C9CC5F8BE8F08F3DD5FA26EBEA79B52972B2FB86CB4DADBEEBC29AC01D3435 -# The Forge version range can use any version of Forge as bounds or match the loader version range + +# Versions accepted when players load the mod. forge_version_range=[25,) -# The loader version range can only use the major version of Forge/FML as bounds loader_version_range=[25,) -# The mapping channel to use for mappings. -# The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"]. -# Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin. -# -# | Channel | Version | | -# |-----------|----------------------|--------------------------------------------------------------------------------| -# | official | MCVersion | Official field/method names from Mojang mapping files | -# | parchment | YYYY.MM.DD-MCVersion | Open community-sourced parameter names and javadocs layered on top of official | -# -# You must be aware of the Mojang license when using the 'official' or 'parchment' mappings. -# See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md -# -# Parchment is an unofficial project maintained by ParchmentMC, separate from Minecraft Forge. -# Additional setup is needed to use their mappings, see https://parchmentmc.org/docs/getting-started + +# MCP mappings for Forge 25. mapping_channel=snapshot -# The mapping version to query from the mapping channel. -# This must match the format required by the mapping channel. mapping_version=20180921-1.13 mcp_version=20190213.203750 - -## Mod Properties - -# The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63} -# Must match the String constant located in the main mod class annotated with @Mod. +# Mod identity. Keep mod_id unchanged so existing saves still load. mod_id=basemetals -# The human-readable display name for the mod. mod_name=Base Metals -# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=LGPL-2.1 -# The mod version. See https://semver.org/ mod_version=3.0.1.113021 -# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. -# This should match the base package used for the mod sources. -# See https://maven.apache.org/guides/mini/guide-naming-conventions.html + +# Maven coordinates and credits. mod_group=zone.moddev.mc.basemetals -# The authors of the mod. This is a simple text string that is used for display purposes in the mod list. mod_authors=Cyanobacterium, jriwanek, dshadowwolf, GetDizzy611, SkyBlade1978, the MMD Team -# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. -mod_description=Adds historically common metals, fantasy metals, alloys, tools, armour, and OreSpawn-powered deposits. +mod_description=Adds real and fantasy metals, alloys, tools and armour. Crush ores with Crack Hammers, blend new metals and discover ores placed by OreSpawn. diff --git a/src/clientIntegrationTest/java/zone/moddev/mc/basemetals/testmod/BaseMetalsClientProbe.java b/src/clientIntegrationTest/java/zone/moddev/mc/basemetals/testmod/BaseMetalsClientProbe.java index 62c87498..27e0e13f 100644 --- a/src/clientIntegrationTest/java/zone/moddev/mc/basemetals/testmod/BaseMetalsClientProbe.java +++ b/src/clientIntegrationTest/java/zone/moddev/mc/basemetals/testmod/BaseMetalsClientProbe.java @@ -31,15 +31,26 @@ import net.minecraft.world.WorldSettings; import net.minecraft.world.WorldType; import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.ModList; +import net.minecraftforge.fml.ExtensionPoint; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.gameevent.TickEvent; +import net.minecraftforge.fml.client.gui.GuiModList; import net.minecraftforge.registries.ForgeRegistries; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import zone.moddev.mc.orespawn.api.client.WorldSettingsExtensionRegistry; +import zone.moddev.mc.basemetals.client.BaseMetalsConfigScreen; +import zone.moddev.mc.basemetals.config.BaseMetalsConfig; +import zone.moddev.mc.basemetals.config.ContentMode; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.gui.GuiYesNo; +import net.minecraft.client.resources.I18n; /** Checks models and renders a disposable world in the packaged Forge client. */ @Mod(BaseMetalsClientProbe.MODID) @@ -79,6 +90,15 @@ private void tick() { if (++stateTicks > 3600) fail(minecraft, "Timed out in client probe state " + state); try { if (state == 0 && minecraft.currentScreen instanceof GuiMainMenu) { + if (Boolean.getBoolean("basemetalsclientprobe.login")) { + require(BaseMetalsConfig.activeMode().serializedName().equals( + System.getProperty("basemetalsclientprobe.expectedMode")), "startup mode differs from profile"); + minecraft.displayGuiScreen(new net.minecraft.client.gui.GuiConnecting( + minecraft.currentScreen, minecraft, "127.0.0.1", + Integer.getInteger("basemetalsclientprobe.port", 25565))); + nextState(3); + return; + } validateClientContent(minecraft); minecraft.launchIntegratedServer(WORLD_DIRECTORY, "Base Metals Client Smoke", new WorldSettings(0L, GameType.CREATIVE, false, false, WorldType.DEFAULT)); @@ -89,15 +109,84 @@ private void tick() { LOGGER.info("BASEMETALS_CLIENT_PROBE PASS frames={}", Integer.valueOf(renderedFrames)); minecraft.shutdown(); nextState(2); + } else if (state == 3) { + checkLogin(minecraft); } } catch (RuntimeException | IOException failure) { fail(minecraft, failure.toString()); } } + private void checkLogin(Minecraft minecraft) throws IOException { + boolean rejected = Boolean.getBoolean("basemetalsclientprobe.expectReject"); + if (minecraft.world != null && minecraft.player != null && stateTicks > 60) { + require(!rejected, "mismatched modes entered gameplay"); + net.minecraft.item.crafting.IRecipe bow = minecraft.world.getRecipeManager().getRecipe( + new ResourceLocation("basemetals", "tin_bow")); + require(bow != null, "recipe IDs changed during mode synchronization"); + require(bow.isDynamic() == (BaseMetalsConfig.activeMode() == ContentMode.LOW_FANTASY), + "client recipe policy did not match the server"); + if (Boolean.getBoolean("basemetalsclientprobe.modeSwitch")) { + require(minecraft.player.getRecipeBook().isUnlocked(bow) + == (BaseMetalsConfig.activeMode() == ContentMode.HIGH_FANTASY), + "earned recipe-book unlock did not survive the mode change"); + for (String name : new String[] {"steel_bow", "adamantine_bow", "adamantine_crossbow", "adamantine_gear", + "adamantine_arrow", "adamantine_rod", "adamantine_pickaxe"}) { + net.minecraft.item.crafting.IRecipe recipe = minecraft.world.getRecipeManager() + .getRecipe(new ResourceLocation("basemetals", name)); + require(minecraft.player.getRecipeBook().isUnlocked(recipe) != recipe.isDynamic(), + "material discovery did not synchronize to the client: " + name); + } + require(!minecraft.player.getRecipeBook().isUnlocked(minecraft.world.getRecipeManager() + .getRecipe(new ResourceLocation("basemetals", "gold_bow"))), + "mode change unlocked an unearned recipe"); + } + require(minecraft.player.inventory.getStackInSlot(0).getItem() == ModContent.item("tin_bow").get(), + "existing restricted item did not synchronize"); + finishLogin(minecraft, "connected"); + } else if (minecraft.currentScreen instanceof net.minecraft.client.gui.GuiDisconnected) { + StringBuilder message = new StringBuilder(); + try { + for (java.lang.reflect.Field field : minecraft.currentScreen.getClass().getDeclaredFields()) { + if (net.minecraft.util.text.ITextComponent.class.isAssignableFrom(field.getType())) { + field.setAccessible(true); + message.append(((net.minecraft.util.text.ITextComponent) field.get(minecraft.currentScreen)).getString()); + } + } + } catch (ReflectiveOperationException failure) { + throw new IllegalStateException(failure); + } + require(rejected && minecraft.world == null, "unexpected disconnect: " + message); + require(message.toString().contains("Base Metals") && message.toString().contains("High Fantasy") + && message.toString().contains("Low Fantasy") && message.toString().contains("Config"), + "disconnect did not explain the mode mismatch: " + message); + finishLogin(minecraft, "rejected"); + } + } + + + private void finishLogin(Minecraft minecraft, String result) throws IOException { + Properties marker = new Properties(); + marker.setProperty("result", result); + marker.setProperty("mode", BaseMetalsConfig.activeMode().serializedName()); + try (FileOutputStream output = new FileOutputStream("mode-login-pass.properties")) { + marker.store(output, "Base Metals content-mode login test"); + } + LOGGER.info("BASEMETALS_MODE_LOGIN_CLIENT PASS result={} mode={}", result, BaseMetalsConfig.activeMode()); + minecraft.shutdown(); + nextState(2); + } + private static void validateClientContent(Minecraft minecraft) throws IOException { require(ModList.get().isLoaded("basemetals"), "Base Metals is not loaded"); require(ModList.get().isLoaded("orespawn"), "OreSpawn is not loaded"); + require(ModList.get().getModContainerById("basemetals").get() + .getCustomExtension(ExtensionPoint.CONFIGGUIFACTORY).isPresent(), + "Base Metals Mods-list configuration screen is missing"); + require(WorldSettingsExtensionRegistry.extensions().stream() + .filter(extension -> "basemetals".equals(extension.id().getNamespace())).count() == 1, + "Base Metals OreSpawn configuration cog is missing or registered twice"); + validateConfigScreen(minecraft); require(MaterialCatalogue.ALL.size() == 22, "material catalogue size"); require(ModContent.blocksById().size() == 360, "block catalogue size"); require(ModContent.itemsById().size() == 1115, "item catalogue size"); @@ -116,6 +205,94 @@ private static void validateClientContent(Minecraft minecraft) throws IOExceptio new ResourceLocation("basemetals", "textures/block/adamantine_block.png")); } + private static void validateConfigScreen(Minecraft minecraft) { + GuiScreen parent = minecraft.currentScreen; + boolean originalEffects = BaseMetalsConfig.SPECIAL_EFFECTS.get(); + String originalMode = BaseMetalsConfig.CONTENT_MODE.get(); + ContentMode activeMode = BaseMetalsConfig.activeMode(); + + GuiModList modsScreen = new GuiModList(parent); + minecraft.displayGuiScreen(modsScreen); + int baseMetalsIndex = -1; + for (int index = 0; index < ModList.get().getMods().size(); index++) { + if ("basemetals".equals(ModList.get().getMods().get(index).getModId())) baseMetalsIndex = index; + } + require(baseMetalsIndex >= 0, "Base Metals is missing from the Mods list"); + modsScreen.selectModIndex(baseMetalsIndex); + ForgeHooksClient.drawScreen(modsScreen, 0, 0, 0.0F); + GuiButton configButton = button(modsScreen, 20); + require(configButton.enabled, "Base Metals Config button is disabled in the Mods list"); + require(modsScreen.mouseClicked(configButton.x + 1, configButton.y + 1, 0), + "Mods-list Config button did not accept a mouse click"); + GuiScreen forgeScreen = minecraft.currentScreen; + require(forgeScreen instanceof BaseMetalsConfigScreen, "Mods-list button opened the wrong screen"); + require(forgeScreen.getChildren().size() == 9, "config screen must expose five settings and four actions"); + click(forgeScreen, 20); + click(forgeScreen, 10); + click(forgeScreen, 1); + require(minecraft.currentScreen == modsScreen, "Cancel did not return to the Mods list"); + require(originalMode.equals(BaseMetalsConfig.CONTENT_MODE.get()) + && originalEffects == BaseMetalsConfig.SPECIAL_EFFECTS.get(), "Cancel changed the loaded config"); + + ForgeHooksClient.drawScreen(modsScreen, 0, 0, 0.0F); + require(button(modsScreen, 20).enabled, "Config button was disabled on returning from the settings"); + modsScreen.selectModIndex(baseMetalsIndex); + ForgeHooksClient.drawScreen(modsScreen, 0, 0, 0.0F); + require(!button(modsScreen, 20).enabled, "Config button stayed enabled with no mod selected"); + int forgeIndex = -1; + for (int index = 0; index < ModList.get().getMods().size(); index++) { + if ("forge".equals(ModList.get().getMods().get(index).getModId())) forgeIndex = index; + } + require(forgeIndex >= 0, "Forge is missing from the Mods list"); + modsScreen.selectModIndex(forgeIndex); + ForgeHooksClient.drawScreen(modsScreen, 0, 0, 0.0F); + require(!button(modsScreen, 20).enabled, "Base Metals enabled the Config button for Forge"); + click(modsScreen, 6); + require(minecraft.currentScreen == parent, "Mods-list Done did not return to the main menu"); + + GuiScreen oreSpawnScreen = WorldSettingsExtensionRegistry.extensions().stream() + .filter(extension -> "basemetals:configuration".equals(extension.id().toString())) + .findFirst().get().createScreen(parent); + require(oreSpawnScreen instanceof BaseMetalsConfigScreen, "OreSpawn factory uses the wrong screen"); + minecraft.displayGuiScreen(oreSpawnScreen); + click(oreSpawnScreen, 10); + click(oreSpawnScreen, 20); + click(oreSpawnScreen, 2); + require(button(oreSpawnScreen, 20).displayString.contains(I18n.format(ContentMode.HIGH_FANTASY.translationKey())), + "Defaults did not restore High Fantasy"); + click(oreSpawnScreen, 3); + require(button(oreSpawnScreen, 10).displayString.endsWith(I18n.format(originalEffects ? "options.on" : "options.off")), + "Undo did not restore the original boolean"); + click(oreSpawnScreen, 20); + click(oreSpawnScreen, 0); + require(minecraft.currentScreen instanceof GuiYesNo, "Mode change has no restart confirmation"); + oreSpawnScreen.confirmResult(false, 0); + require(minecraft.currentScreen == oreSpawnScreen, "Declining confirmation lost pending edits"); + require(BaseMetalsConfig.CONTENT_MODE.get().equals(originalMode), "Declining confirmation saved the mode"); + click(oreSpawnScreen, 0); + oreSpawnScreen.confirmResult(true, 0); + require(minecraft.currentScreen == parent, "Done did not return to the OreSpawn parent"); + require(!BaseMetalsConfig.CONTENT_MODE.get().equals(originalMode), "Done did not save the string property"); + require(BaseMetalsConfig.activeMode() == activeMode, "GUI changes altered the startup-latched mode"); + + // Restore the disposable profile before the integrated-world smoke test. + BaseMetalsConfig.set(BaseMetalsConfig.CONTENT_MODE, originalMode); + BaseMetalsConfig.set(BaseMetalsConfig.SPECIAL_EFFECTS, originalEffects); + BaseMetalsConfig.save(); + require(!I18n.format("config.basemetals.title").startsWith("config."), "GUI title is untranslated"); + LOGGER.info("BASEMETALS_CONFIG_GUI_PROBE PASS entries=5 factories=2 mods_button=true cancel=true undo=true defaults=true save=true"); + } + + private static GuiButton button(GuiScreen screen, int id) { + return screen.getChildren().stream().filter(child -> child instanceof GuiButton) + .map(child -> (GuiButton) child).filter(button -> button.id == id).findFirst() + .orElseThrow(() -> new IllegalStateException("Missing config button " + id)); + } + + private static void click(GuiScreen screen, int id) { + button(screen, id).onClick(0, 0); + } + private static void validateOreModels(Minecraft minecraft) throws IOException { int ores = 0; for (MaterialDefinition material : MaterialCatalogue.ALL) { @@ -132,12 +309,13 @@ private static void validateOreModels(Minecraft minecraft) throws IOException { Block block = ModContent.blocksById().get(name).get(); require(block.getRenderLayer() == BlockRenderLayer.CUTOUT_MIPPED, name + " is not cutout-mipped"); + String overlay = "basemetals:block/ore_overlays/" + name; IBakedModel blockModel = minecraft.getBlockRendererDispatcher().getModelForState(block.getDefaultState()); - validateOreModel(blockModel, block, name, host); + validateOreModel(blockModel, block, name, host, overlay); ItemStack stack = new ItemStack(ModContent.item(name).get()); IBakedModel itemModel = minecraft.getItemRenderer().getItemModelWithOverrides(stack, null, null); - validateOreModel(itemModel, null, name + " item", host); + validateOreModel(itemModel, null, name + " item", host, overlay); } require(ores == 13, "overlay ore count"); @@ -147,7 +325,7 @@ private static void validateOreModels(Minecraft minecraft) throws IOException { LOGGER.info("BASEMETALS_ORE_OVERLAY_PROBE PASS ores={} host_overrides=3", Integer.valueOf(ores)); } - private static void validateOreModel(IBakedModel model, Block block, String name, String host) { + private static void validateOreModel(IBakedModel model, Block block, String name, String host, String overlay) { require(host.equals(model.getParticleTexture().getName().toString()), name + " particle host"); Random random = new Random(42L); require(model.getQuads(block == null ? null : block.getDefaultState(), null, random).isEmpty(), @@ -161,11 +339,21 @@ private static void validateOreModel(IBakedModel model, Block block, String name for (BakedQuad quad : quads) { String texture = quad.getSprite().getName().toString(); hasBase |= host.equals(texture); - hasOverlay |= "minecraft:block/glass".equals(texture); + hasOverlay |= overlay.equals(texture); require(!"missingno".equals(quad.getSprite().getName().getPath()), name + " missing texture"); - validateOreVertices(quad, "minecraft:block/glass".equals(texture), name); - if ("minecraft:block/glass".equals(texture)) { - require(quad.getSprite().isPixelTransparent(0, 8, 8), name + " overlay lost transparency"); + validateOreVertices(quad, overlay.equals(texture), name); + if (overlay.equals(texture)) { + boolean transparent = false; + boolean visible = false; + + for (int y = 0; y < quad.getSprite().getHeight(); y++) { + for (int x = 0; x < quad.getSprite().getWidth(); x++) { + if (quad.getSprite().isPixelTransparent(0, x, y)) transparent = true; + else visible = true; + } + } + + require(transparent && visible, name + " overlay must contain ore and transparent host pixels"); } } diff --git a/src/generated/resources/assets/basemetals/lang/de_de.json b/src/generated/resources/assets/basemetals/lang/de_de.json index d9793c8b..a68d1e8d 100644 --- a/src/generated/resources/assets/basemetals/lang/de_de.json +++ b/src/generated/resources/assets/basemetals/lang/de_de.json @@ -4,16 +4,16 @@ "itemGroup.basemetals.combat": "Base Metals Combat", "itemGroup.basemetals.items": "Base Metals Gegenstände", "itemGroup.basemetals.tools": "Base Metals Werkzeuge", - "tooltip.adamantine.tool": "+%d Schaden gegen zähe Feinde", - "tooltip.adamantine.armor": "Volle Rüstung: Schadensreduktion", - "tooltip.aquarium.tool": "+%d Schaden gegen aquatische Feinde", - "tooltip.aquarium.armor": "Volle Rüstung: Unterwasseratmung", - "tooltip.coldiron.tool": "+%d Schaden gegen feurige Feinde", - "tooltip.coldiron.armor": "Volle Rüstung: Feuerimmunität", - "tooltip.mithril.tool": "Blendet Wither und Untote", - "tooltip.mithril.armor": "Volle Rüstung: Immunität gegen Gift \u0026 Wither", - "tooltip.starsteel.tool": "Repariert 1 Schaden alle %d Sekunden", - "tooltip.starsteel.armor": "Volle Rüstung: Gewichtsreduktion", + "tooltip.adamantine.tool": "Nahkampftreffer: +%d Schaden gegen Gegner mit mehr als 10 Herzen maximaler Gesundheit", + "tooltip.adamantine.armor": "Zwei Teile geben Resistenz I; die vollständige Rüstung gibt Resistenz II", + "tooltip.aquarium.tool": "Nahkampftreffer: +%d Schaden gegen Gegner, die unter Wasser atmen", + "tooltip.aquarium.armor": "Vollständige Rüstung im Wasser: Unterwasseratmung, Resistenz und keine Abbaulähmung", + "tooltip.coldiron.tool": "Nahkampftreffer: +%d Schaden gegen feuerimmune Gegner", + "tooltip.coldiron.armor": "Vollständige Rüstung: Feuerresistenz", + "tooltip.mithril.tool": "Nahkampftreffer blenden Untote und verursachen 3 Sekunden lang Wither", + "tooltip.mithril.armor": "Vollständige Rüstung: entfernt schädliche Trankeffekte", + "tooltip.starsteel.tool": "Repariert sich in der Hand: 1 Haltbarkeit alle %d Sekunden", + "tooltip.starsteel.armor": "Springe mit jedem Teil höher; ab zwei Teilen wirst du auch schneller", "advancements.basemetals.aquarium_maker.title": "Aquarium", "advancements.basemetals.angel_of_death.title": "Todesengel", "advancements.basemetals.brass_maker.title": "Messing", @@ -31,7 +31,7 @@ "advancements.basemetals.scuba_diver.title": "SCUBA Diver", "advancements.basemetals.steel_maker.title": "Stahl", "advancements.basemetals.this_is_new.title": "Das ist neu ...", - "advancements.basemetals.aquarium_maker.description": "Kombiniere Kupferpulver, Zinkpulver und Prismarinkristalle, um Aquarium herzustellen", + "advancements.basemetals.aquarium_maker.description": "Schmelze Aquarium aus einer Mischung von Kupfer-, Zink- und Prismarinpulver", "advancements.basemetals.angel_of_death.description": "Trage eine vollständige Mithrilrüstung und führe ein Mithrilschwert", "advancements.basemetals.brass_maker.description": "Kombiniere Kupferpulver und Zinkpulver, um Messing herzustellen", "advancements.basemetals.bronze_maker.description": "Kombiniere Kupferpulver und Zinnpulver, um Bronze herzustellen", @@ -39,14 +39,14 @@ "advancements.basemetals.cupronickel_maker.description": "Kombiniere Kupferpulver und Nickelpulver, um Kupfernickel herzustellen", "advancements.basemetals.demon_slayer.description": "Trage eine vollständige Kalteisenrüstung und führe ein Kalteisenschwert", "advancements.basemetals.electrum_maker.description": "Kombiniere Silberpulver und Goldpulver, um Elektron herzustellen", - "advancements.basemetals.geologist.description": "Stelle einen Hammer aus einem Metallblock her", + "advancements.basemetals.geologist.description": "Stelle einen Crack Hammer her", "advancements.basemetals.invar_maker.description": "Kombiniere Eisenpulver und Nickelpulver, um Invar herzustellen", "advancements.basemetals.juggernaut.description": "Trage eine vollständige Adamantrüstung", "advancements.basemetals.metallurgy.description": "Stelle ein beliebiges Gemisch her", "advancements.basemetals.mithril_maker.description": "Kombiniere Silverpulver, Kalteisenpulver und Quecksilberpulver, um Mithril herzustellen", "advancements.basemetals.moon_boots.description": "Trage ein Paar Sternenstahlstiefel", "advancements.basemetals.scuba_diver.description": "Trage eine vollständige Aquariumrüstung und tauche im Wasser", - "advancements.basemetals.steel_maker.description": "Kombiniere Eisenpulver mit Holzkohlepulver, um Stahl herzustellen", + "advancements.basemetals.steel_maker.description": "Schmelze Stahl aus einer Mischung von Eisen- und Kohlepulver", "advancements.basemetals.this_is_new.description": "Schmelze ein neues Metall des Base Metals Mod", "item.basemetals.adamantine_axe": "Adamantaxt", "item.basemetals.aquarium_axe": "Aquariumaxt", @@ -844,8 +844,8 @@ "fluid.basemetals.bismuth.name": "Geschmolzenes Bismuth", "fluid.basemetals.brass.name": "Geschmolzenes Messing", "fluid.basemetals.bronze.name": "Geschmolzenes Bronze", - "fluid.basemetals.charcoal.name": "Liquifacted Charcoal", - "fluid.basemetals.coal.name": "Liquifacted Coal", + "fluid.basemetals.charcoal.name": "Verflüssigte Holzkohle", + "fluid.basemetals.coal.name": "Verflüssigte Kohle", "fluid.basemetals.coldiron.name": "Geschmolzenes Kalteisen", "fluid.basemetals.copper.name": "Geschmolzenes Kupfer", "fluid.basemetals.cupronickel.name": "Geschmolzenes Kupfernickel", @@ -871,8 +871,8 @@ "block.basemetals.bismuth": "Geschmolzenes Bismuth", "block.basemetals.brass": "Geschmolzenes Messing", "block.basemetals.bronze": "Geschmolzenes Bronze", - "block.basemetals.charcoal": "Liquifacted Charcoal", - "block.basemetals.coal": "Liquifacted Coal", + "block.basemetals.charcoal": "Verflüssigte Holzkohle", + "block.basemetals.coal": "Verflüssigte Kohle", "block.basemetals.coldiron": "Geschmolzenes Kalteisen", "block.basemetals.copper": "Geschmolzenes Kupfer", "block.basemetals.cupronickel": "Geschmolzenes Kupfernickel", @@ -1855,5 +1855,26 @@ "slurry.basemetals.dirty_zinc": "Dirty Zinc Slurry", "slurry.basemetals.clean_zinc": "Clean Zinc Slurry", "advancements.basemetals.pewter_maker.title": "Pewter Maker", - "advancements.basemetals.pewter_maker.description": "Progress through Base Metals: Pewter Maker." -} \ No newline at end of file + "advancements.basemetals.pewter_maker.description": "Schmelze Pewter aus einer Mischung von Zinn-, Kupfer- und Bleipulver", + "config.basemetals.title": "Base Metals – Einstellungen", + "config.basemetals.contentMode": "Spielmodus", + "config.basemetals.contentMode.tooltip": "Wähle, wie frei du mit Metallen bauen und herstellen kannst. Die Erzverteilung bleibt gleich.", + "config.basemetals.content_mode.high_fantasy": "High Fantasy", + "config.basemetals.content_mode.low_fantasy": "Low Fantasy", + "config.basemetals.content_mode.high_fantasy.description": "Nutze jedes Metall nach Belieben. Alle Rezepte, Handelsangebote und Truhenfunde sind verfügbar.", + "config.basemetals.content_mode.low_fantasy.description": "Fantasymetalle bleiben, doch nicht jedes Material eignet sich für alles. Keine Bögen, Armbrüste oder Angeln von Base Metals.", + "config.basemetals.specialEffects": "Besondere Ausrüstungseffekte", + "config.basemetals.specialEffects.tooltip": "Verleiht bestimmten Metallen besondere Rüstungs- und Nahkampfeffekte, etwa Unterwasseratmung mit einer vollständigen Aquarium-Rüstung.", + "config.basemetals.starsteelRegeneration": "Starsteel-Selbstreparatur", + "config.basemetals.starsteelRegeneration.tooltip": "Starsteel-Ausrüstung repariert sich in der Hand: 1 Haltbarkeit alle 10 Sekunden. Rüstung repariert sich nicht selbst.", + "config.basemetals.mercuryImmersionEffects": "Quecksilbervergiftung", + "config.basemetals.mercuryImmersionEffects.tooltip": "Kontakt mit flüssigem Quecksilber kann Übelkeit verursachen.", + "config.basemetals.villagerTrades": "Dorfbewohnerhandel", + "config.basemetals.villagerTrades.tooltip": "Schmiede verkaufen Barren und Ausrüstung von Base Metals.", + "config.basemetals.defaults": "Standardwerte", + "config.basemetals.undo": "Rückgängig", + "config.basemetals.confirm.title": "Spielmodus ändern?", + "config.basemetals.confirm.message": "Starte Minecraft neu, um den neuen Modus zu nutzen. Vorhandene Gegenstände bleiben nutzbar. Auf einem Server musst du denselben Modus wie der Server wählen.", + "config.basemetals.restart": "Starte Minecraft nach einem Moduswechsel neu. Die Auswahl gilt für alle deine Welten. Die Erzverteilung änderst du in OreSpawn.", + "config.basemetals.connection.mismatch": "Dieser Server nutzt %s, dein Spiel jedoch %s. Wähle unter Mods → Base Metals → Config denselben Spielmodus und starte Minecraft neu." +} diff --git a/src/generated/resources/assets/basemetals/lang/en_au.json b/src/generated/resources/assets/basemetals/lang/en_au.json index ecdc0617..266f3b95 100644 --- a/src/generated/resources/assets/basemetals/lang/en_au.json +++ b/src/generated/resources/assets/basemetals/lang/en_au.json @@ -379,16 +379,16 @@ "block.basemetals.zinc_plate": "Zinc Plate", "block.basemetals.iron_plate": "Iron Plate", "block.basemetals.gold_plate": "Gold Plate", - "tooltip.adamantine.tool": "+%x damage against tough enemies", - "tooltip.aquarium.tool": "+%x damage against aquatic enemies", - "tooltip.coldiron.tool": "+%x damage against firey enemies", - "tooltip.mithril.tool": "Blinds and withers undead", - "tooltip.starsteel.tool": "Repairs 1 damage every %x seconds", - "tooltip.adamantine.armor": "Reduces damage taken", - "tooltip.aquarium.armor": "Full suit: breathe underwater", - "tooltip.coldiron.armor": "Full suit: fire immunity", - "tooltip.mithril.armor": "Full suit: protection from poison \u0026 wither", - "tooltip.starsteel.armor": "Reduces your weight", + "tooltip.adamantine.tool": "Melee hits: +%d damage against enemies with more than 10 hearts of maximum health", + "tooltip.aquarium.tool": "Melee hits: +%d damage against enemies that breathe underwater", + "tooltip.coldiron.tool": "Melee hits: +%d damage against fire-immune enemies", + "tooltip.mithril.tool": "Melee hits blind undead and inflict Wither for 3 seconds", + "tooltip.starsteel.tool": "Repairs itself while held: 1 durability every %d seconds", + "tooltip.adamantine.armor": "Two pieces grant Resistance I; a full suit grants Resistance II", + "tooltip.aquarium.armor": "Full suit in water: breathe underwater, resist damage and remove Mining Fatigue", + "tooltip.coldiron.armor": "Full suit: Fire Resistance", + "tooltip.mithril.armor": "Full suit: removes harmful potion effects", + "tooltip.starsteel.armor": "Jump higher with each piece; two or more pieces also boost speed", "advancements.basemetals.this_is_new.title": "This is new...", "advancements.basemetals.blocktastic.title": "Blocktastic!", "advancements.basemetals.geologist.title": "Geologist", @@ -407,14 +407,14 @@ "advancements.basemetals.moon_boots.title": "Moon Walker", "advancements.basemetals.this_is_new.description": "Smelt a new metal from the Base Metals mod", "advancements.basemetals.blocktastic.description": "Place a metal block that is neither iron nor gold", - "advancements.basemetals.geologist.description": "Make a hammer from a metal block", + "advancements.basemetals.geologist.description": "Craft a Crack Hammer", "advancements.basemetals.brass_maker.description": "Combine powdered copper and zinc to make brass", "advancements.basemetals.bronze_maker.description": "Combine powdered copper and tin to make bronze", "advancements.basemetals.electrum_maker.description": "Combine powdered silver and gold to make electrum", - "advancements.basemetals.steel_maker.description": "Combine powdered iron and charcoal to make steel", + "advancements.basemetals.steel_maker.description": "Smelt Steel from a blend of iron and coal powders", "advancements.basemetals.invar_maker.description": "Combine powdered iron and nickel to make invar", "advancements.basemetals.mithril_maker.description": "Combine powdered silver, cold-iron and mercury to make mithril", - "advancements.basemetals.aquarium_maker.description": "Combine powdered copper and zinc with prismarine crystals to make aquarium", + "advancements.basemetals.aquarium_maker.description": "Smelt Aquarium from a blend of copper, zinc and prismarine powders", "advancements.basemetals.metallurgy.description": "Craft any alloy blend", "advancements.basemetals.demon_slayer.description": "Wear a full suit of cold-iron armor and wield a cold-iron sword", "advancements.basemetals.angel_of_death.description": "Wear a full suit of mithril armor and wield a mithril sword", @@ -798,8 +798,8 @@ "block.basemetals.steel": "Molten Steel", "block.basemetals.tin": "Molten Tin", "block.basemetals.zinc": "Molten Zinc", - "block.basemetals.charcoal": "Molten Charcoal", - "block.basemetals.coal": "Molten Coal", + "block.basemetals.charcoal": "Liquefied Charcoal", + "block.basemetals.coal": "Liquefied Coal", "block.basemetals.diamond": "Molten Diamond", "block.basemetals.emerald": "Molten Emerald", "block.basemetals.ender": "Molten Ender", @@ -1576,5 +1576,30 @@ "slurry.basemetals.clean_zinc": "Clean Zinc Slurry", "advancements.basemetals.cupronickel_maker.title": "Cupronickel Maker", "advancements.basemetals.pewter_maker.title": "Pewter Maker", - "advancements.basemetals.pewter_maker.description": "Progress through Base Metals: Pewter Maker." -} \ No newline at end of file + "advancements.basemetals.pewter_maker.description": "Smelt Pewter from a blend of tin, copper and lead powders", + "config.basemetals.title": "Base Metals Settings", + "config.basemetals.contentMode": "Content mode", + "config.basemetals.contentMode.tooltip": "Choose how freely you can craft with metals. Ore generation stays the same.", + "config.basemetals.content_mode.high_fantasy": "High Fantasy", + "config.basemetals.content_mode.low_fantasy": "Low Fantasy", + "config.basemetals.content_mode.high_fantasy.description": "Craft freely with every metal. All recipes, villager trades and chest loot are available.", + "config.basemetals.content_mode.low_fantasy.description": "Keep fantasy metals, but limit what you can make from each material. No Base Metals bows, crossbows or fishing rods.", + "config.basemetals.specialEffects": "Special equipment effects", + "config.basemetals.specialEffects.tooltip": "Give certain metals their special armour and melee bonuses, such as breathing underwater in a full Aquarium suit.", + "config.basemetals.starsteelRegeneration": "Starsteel self-repair", + "config.basemetals.starsteelRegeneration.tooltip": "Starsteel equipment repairs itself while held: 1 durability every 10 seconds. Armour does not self-repair.", + "config.basemetals.mercuryImmersionEffects": "Mercury poisoning", + "config.basemetals.mercuryImmersionEffects.tooltip": "Touching liquid mercury can make you nauseous.", + "config.basemetals.villagerTrades": "Villager trades", + "config.basemetals.villagerTrades.tooltip": "Let blacksmiths sell Base Metals ingots and equipment.", + "config.basemetals.defaults": "Defaults", + "config.basemetals.undo": "Undo", + "config.basemetals.confirm.title": "Change content mode?", + "config.basemetals.confirm.message": "Restart Minecraft to use the new mode. You can still use everything you already own. To play on a server, choose the same mode as the server.", + "config.basemetals.restart": "Restart Minecraft after changing modes. This choice applies to all your worlds. Use OreSpawn to change where ores generate.", + "config.basemetals.connection.mismatch": "This server uses %s, but your game uses %s. Choose the same content mode in Mods → Base Metals → Config, then restart Minecraft.", + "fluid.basemetals.coal.name": "Liquefied Coal", + "item.bucket.coal": "Bucket of Liquefied Coal", + "fluid.basemetals.charcoal.name": "Liquefied Charcoal", + "item.bucket.charcoal": "Bucket of Liquefied Charcoal" +} diff --git a/src/generated/resources/assets/basemetals/lang/en_ca.json b/src/generated/resources/assets/basemetals/lang/en_ca.json index 4aa77f69..96e1801a 100644 --- a/src/generated/resources/assets/basemetals/lang/en_ca.json +++ b/src/generated/resources/assets/basemetals/lang/en_ca.json @@ -378,16 +378,16 @@ "block.basemetals.zinc_plate": "Zinc Plate", "block.basemetals.iron_plate": "Iron Plate", "block.basemetals.gold_plate": "Gold Plate", - "tooltip.adamantine.tool": "+%x damage against tough enemies", - "tooltip.aquarium.tool": "+%x damage against aquatic enemies", - "tooltip.coldiron.tool": "+%x damage against firey enemies", - "tooltip.mithril.tool": "Blinds and withers undead", - "tooltip.starsteel.tool": "Repairs 1 damage every %x seconds", - "tooltip.adamantine.armor": "Reduces damage taken", - "tooltip.aquarium.armor": "Full suit: breathe underwater", - "tooltip.coldiron.armor": "Full suit: fire immunity", - "tooltip.mithril.armor": "Full suit: protection from poison \u0026 wither", - "tooltip.starsteel.armor": "Reduces your weight", + "tooltip.adamantine.tool": "Melee hits: +%d damage against enemies with more than 10 hearts of maximum health", + "tooltip.aquarium.tool": "Melee hits: +%d damage against enemies that breathe underwater", + "tooltip.coldiron.tool": "Melee hits: +%d damage against fire-immune enemies", + "tooltip.mithril.tool": "Melee hits blind undead and inflict Wither for 3 seconds", + "tooltip.starsteel.tool": "Repairs itself while held: 1 durability every %d seconds", + "tooltip.adamantine.armor": "Two pieces grant Resistance I; a full suit grants Resistance II", + "tooltip.aquarium.armor": "Full suit in water: breathe underwater, resist damage and remove Mining Fatigue", + "tooltip.coldiron.armor": "Full suit: Fire Resistance", + "tooltip.mithril.armor": "Full suit: removes harmful potion effects", + "tooltip.starsteel.armor": "Jump higher with each piece; two or more pieces also boost speed", "advancements.basemetals.this_is_new.title": "This is new...", "advancements.basemetals.blocktastic.title": "Blocktastic!", "advancements.basemetals.geologist.title": "Geologist", @@ -406,14 +406,14 @@ "advancements.basemetals.moon_boots.title": "Moon Walker", "advancements.basemetals.this_is_new.description": "Smelt a new metal from the Base Metals mod", "advancements.basemetals.blocktastic.description": "Place a metal block that is neither iron nor gold", - "advancements.basemetals.geologist.description": "Make a hammer from a metal block", + "advancements.basemetals.geologist.description": "Craft a Crack Hammer", "advancements.basemetals.brass_maker.description": "Combine powdered copper and zinc to make brass", "advancements.basemetals.bronze_maker.description": "Combine powdered copper and tin to make bronze", "advancements.basemetals.electrum_maker.description": "Combine powdered silver and gold to make electrum", - "advancements.basemetals.steel_maker.description": "Combine powdered iron and charcoal to make steel", + "advancements.basemetals.steel_maker.description": "Smelt Steel from a blend of iron and coal powders", "advancements.basemetals.invar_maker.description": "Combine powdered iron and nickel to make invar", "advancements.basemetals.mithril_maker.description": "Combine powdered silver, cold-iron and mercury to make mithril", - "advancements.basemetals.aquarium_maker.description": "Combine powdered copper and zinc with prismarine crystals to make aquarium", + "advancements.basemetals.aquarium_maker.description": "Smelt Aquarium from a blend of copper, zinc and prismarine powders", "advancements.basemetals.metallurgy.description": "Craft any alloy blend", "advancements.basemetals.demon_slayer.description": "Wear a full suit of cold-iron armor and wield a cold-iron sword", "advancements.basemetals.angel_of_death.description": "Wear a full suit of mithril armor and wield a mithril sword", @@ -798,8 +798,8 @@ "block.basemetals.steel": "Molten Steel", "block.basemetals.tin": "Molten Tin", "block.basemetals.zinc": "Molten Zinc", - "block.basemetals.charcoal": "Molten Charcoal", - "block.basemetals.coal": "Molten Coal", + "block.basemetals.charcoal": "Liquefied Charcoal", + "block.basemetals.coal": "Liquefied Coal", "block.basemetals.diamond": "Molten Diamond", "block.basemetals.emerald": "Molten Emerald", "block.basemetals.ender": "Molten Ender", @@ -1576,5 +1576,30 @@ "slurry.basemetals.clean_zinc": "Clean Zinc Slurry", "advancements.basemetals.cupronickel_maker.title": "Cupronickel Maker", "advancements.basemetals.pewter_maker.title": "Pewter Maker", - "advancements.basemetals.pewter_maker.description": "Progress through Base Metals: Pewter Maker." -} \ No newline at end of file + "advancements.basemetals.pewter_maker.description": "Smelt Pewter from a blend of tin, copper and lead powders", + "config.basemetals.title": "Base Metals Settings", + "config.basemetals.contentMode": "Content mode", + "config.basemetals.contentMode.tooltip": "Choose how freely you can craft with metals. Ore generation stays the same.", + "config.basemetals.content_mode.high_fantasy": "High Fantasy", + "config.basemetals.content_mode.low_fantasy": "Low Fantasy", + "config.basemetals.content_mode.high_fantasy.description": "Craft freely with every metal. All recipes, villager trades and chest loot are available.", + "config.basemetals.content_mode.low_fantasy.description": "Keep fantasy metals, but limit what you can make from each material. No Base Metals bows, crossbows or fishing rods.", + "config.basemetals.specialEffects": "Special equipment effects", + "config.basemetals.specialEffects.tooltip": "Give certain metals their special armour and melee bonuses, such as breathing underwater in a full Aquarium suit.", + "config.basemetals.starsteelRegeneration": "Starsteel self-repair", + "config.basemetals.starsteelRegeneration.tooltip": "Starsteel equipment repairs itself while held: 1 durability every 10 seconds. Armour does not self-repair.", + "config.basemetals.mercuryImmersionEffects": "Mercury poisoning", + "config.basemetals.mercuryImmersionEffects.tooltip": "Touching liquid mercury can make you nauseous.", + "config.basemetals.villagerTrades": "Villager trades", + "config.basemetals.villagerTrades.tooltip": "Let blacksmiths sell Base Metals ingots and equipment.", + "config.basemetals.defaults": "Defaults", + "config.basemetals.undo": "Undo", + "config.basemetals.confirm.title": "Change content mode?", + "config.basemetals.confirm.message": "Restart Minecraft to use the new mode. You can still use everything you already own. To play on a server, choose the same mode as the server.", + "config.basemetals.restart": "Restart Minecraft after changing modes. This choice applies to all your worlds. Use OreSpawn to change where ores generate.", + "config.basemetals.connection.mismatch": "This server uses %s, but your game uses %s. Choose the same content mode in Mods → Base Metals → Config, then restart Minecraft.", + "fluid.basemetals.coal.name": "Liquefied Coal", + "item.bucket.coal": "Bucket of Liquefied Coal", + "fluid.basemetals.charcoal.name": "Liquefied Charcoal", + "item.bucket.charcoal": "Bucket of Liquefied Charcoal" +} diff --git a/src/generated/resources/assets/basemetals/lang/en_en.json b/src/generated/resources/assets/basemetals/lang/en_en.json index 2ac05a3c..a080bf62 100644 --- a/src/generated/resources/assets/basemetals/lang/en_en.json +++ b/src/generated/resources/assets/basemetals/lang/en_en.json @@ -378,16 +378,16 @@ "block.basemetals.zinc_plate": "Zinc Plate", "block.basemetals.iron_plate": "Iron Plate", "block.basemetals.gold_plate": "Gold Plate", - "tooltip.adamantine.tool": "+%x damage against tough enemies", - "tooltip.aquarium.tool": "+%x damage against aquatic enemies", - "tooltip.coldiron.tool": "+%x damage against firey enemies", - "tooltip.mithril.tool": "Blinds and withers undead", - "tooltip.starsteel.tool": "Repairs 1 damage every %x seconds", - "tooltip.adamantine.armor": "Reduces damage taken", - "tooltip.aquarium.armor": "Full suit: breathe underwater", - "tooltip.coldiron.armor": "Full suit: fire immunity", - "tooltip.mithril.armor": "Full suit: protection from poison \u0026 wither", - "tooltip.starsteel.armor": "Reduces your weight", + "tooltip.adamantine.tool": "Melee hits: +%d damage against enemies with more than 10 hearts of maximum health", + "tooltip.aquarium.tool": "Melee hits: +%d damage against enemies that breathe underwater", + "tooltip.coldiron.tool": "Melee hits: +%d damage against fire-immune enemies", + "tooltip.mithril.tool": "Melee hits blind undead and inflict Wither for 3 seconds", + "tooltip.starsteel.tool": "Repairs itself while held: 1 durability every %d seconds", + "tooltip.adamantine.armor": "Two pieces grant Resistance I; a full suit grants Resistance II", + "tooltip.aquarium.armor": "Full suit in water: breathe underwater, resist damage and remove Mining Fatigue", + "tooltip.coldiron.armor": "Full suit: Fire Resistance", + "tooltip.mithril.armor": "Full suit: removes harmful potion effects", + "tooltip.starsteel.armor": "Jump higher with each piece; two or more pieces also boost speed", "advancements.basemetals.this_is_new.title": "This is new...", "advancements.basemetals.blocktastic.title": "Blocktastic!", "advancements.basemetals.geologist.title": "Geologist", @@ -406,14 +406,14 @@ "advancements.basemetals.moon_boots.title": "Moon Walker", "advancements.basemetals.this_is_new.description": "Smelt a new metal from the Base Metals mod", "advancements.basemetals.blocktastic.description": "Place a metal block that is neither iron nor gold", - "advancements.basemetals.geologist.description": "Make a hammer from a metal block", + "advancements.basemetals.geologist.description": "Craft a Crack Hammer", "advancements.basemetals.brass_maker.description": "Combine powdered copper and zinc to make brass", "advancements.basemetals.bronze_maker.description": "Combine powdered copper and tin to make bronze", "advancements.basemetals.electrum_maker.description": "Combine powdered silver and gold to make electrum", - "advancements.basemetals.steel_maker.description": "Combine powdered iron and powdered charcoal to make steel", + "advancements.basemetals.steel_maker.description": "Smelt Steel from a blend of iron and coal powders", "advancements.basemetals.invar_maker.description": "Combine powdered iron and nickel to make invar", "advancements.basemetals.mithril_maker.description": "Combine powdered silver, cold-iron and mercury to make mithril", - "advancements.basemetals.aquarium_maker.description": "Combine powdered copper and zinc with prismarine crystals to make aquarium", + "advancements.basemetals.aquarium_maker.description": "Smelt Aquarium from a blend of copper, zinc and prismarine powders", "advancements.basemetals.metallurgy.description": "Craft any alloy blend", "advancements.basemetals.demon_slayer.description": "Wear a full suit of cold-iron armor and wield a cold-iron sword", "advancements.basemetals.angel_of_death.description": "Wear a full suit of mithril armor and wield a mithril sword", @@ -798,8 +798,8 @@ "block.basemetals.steel": "Molten Steel", "block.basemetals.tin": "Molten Tin", "block.basemetals.zinc": "Molten Zinc", - "block.basemetals.charcoal": "Molten Charcoal", - "block.basemetals.coal": "Molten Coal", + "block.basemetals.charcoal": "Liquefied Charcoal", + "block.basemetals.coal": "Liquefied Coal", "block.basemetals.diamond": "Molten Diamond", "block.basemetals.emerald": "Molten Emerald", "block.basemetals.ender": "Molten Ender", @@ -1576,5 +1576,30 @@ "slurry.basemetals.clean_zinc": "Clean Zinc Slurry", "advancements.basemetals.cupronickel_maker.title": "Cupronickel Maker", "advancements.basemetals.pewter_maker.title": "Pewter Maker", - "advancements.basemetals.pewter_maker.description": "Progress through Base Metals: Pewter Maker." -} \ No newline at end of file + "advancements.basemetals.pewter_maker.description": "Smelt Pewter from a blend of tin, copper and lead powders", + "config.basemetals.title": "Base Metals Settings", + "config.basemetals.contentMode": "Content mode", + "config.basemetals.contentMode.tooltip": "Choose how freely you can craft with metals. Ore generation stays the same.", + "config.basemetals.content_mode.high_fantasy": "High Fantasy", + "config.basemetals.content_mode.low_fantasy": "Low Fantasy", + "config.basemetals.content_mode.high_fantasy.description": "Craft freely with every metal. All recipes, villager trades and chest loot are available.", + "config.basemetals.content_mode.low_fantasy.description": "Keep fantasy metals, but limit what you can make from each material. No Base Metals bows, crossbows or fishing rods.", + "config.basemetals.specialEffects": "Special equipment effects", + "config.basemetals.specialEffects.tooltip": "Give certain metals their special armour and melee bonuses, such as breathing underwater in a full Aquarium suit.", + "config.basemetals.starsteelRegeneration": "Starsteel self-repair", + "config.basemetals.starsteelRegeneration.tooltip": "Starsteel equipment repairs itself while held: 1 durability every 10 seconds. Armour does not self-repair.", + "config.basemetals.mercuryImmersionEffects": "Mercury poisoning", + "config.basemetals.mercuryImmersionEffects.tooltip": "Touching liquid mercury can make you nauseous.", + "config.basemetals.villagerTrades": "Villager trades", + "config.basemetals.villagerTrades.tooltip": "Let blacksmiths sell Base Metals ingots and equipment.", + "config.basemetals.defaults": "Defaults", + "config.basemetals.undo": "Undo", + "config.basemetals.confirm.title": "Change content mode?", + "config.basemetals.confirm.message": "Restart Minecraft to use the new mode. You can still use everything you already own. To play on a server, choose the same mode as the server.", + "config.basemetals.restart": "Restart Minecraft after changing modes. This choice applies to all your worlds. Use OreSpawn to change where ores generate.", + "config.basemetals.connection.mismatch": "This server uses %s, but your game uses %s. Choose the same content mode in Mods → Base Metals → Config, then restart Minecraft.", + "fluid.basemetals.coal.name": "Liquefied Coal", + "item.bucket.coal": "Bucket of Liquefied Coal", + "fluid.basemetals.charcoal.name": "Liquefied Charcoal", + "item.bucket.charcoal": "Bucket of Liquefied Charcoal" +} diff --git a/src/generated/resources/assets/basemetals/lang/en_gb.json b/src/generated/resources/assets/basemetals/lang/en_gb.json index 03368d01..d824aff4 100644 --- a/src/generated/resources/assets/basemetals/lang/en_gb.json +++ b/src/generated/resources/assets/basemetals/lang/en_gb.json @@ -378,16 +378,16 @@ "block.basemetals.zinc_plate": "Zinc Plate", "block.basemetals.iron_plate": "Iron Plate", "block.basemetals.gold_plate": "Gold Plate", - "tooltip.adamantine.tool": "+%x damage against tough enemies", - "tooltip.aquarium.tool": "+%x damage against aquatic enemies", - "tooltip.coldiron.tool": "+%x damage against firey enemies", - "tooltip.mithril.tool": "Blinds and withers undead", - "tooltip.starsteel.tool": "Repairs 1 damage every %x seconds", - "tooltip.adamantine.armor": "Reduces damage taken", - "tooltip.aquarium.armor": "Full suit: breathe underwater", - "tooltip.coldiron.armor": "Full suit: fire immunity", - "tooltip.mithril.armor": "Full suit: protection from poison \u0026 wither", - "tooltip.starsteel.armor": "Reduces your weight", + "tooltip.adamantine.tool": "Melee hits: +%d damage against enemies with more than 10 hearts of maximum health", + "tooltip.aquarium.tool": "Melee hits: +%d damage against enemies that breathe underwater", + "tooltip.coldiron.tool": "Melee hits: +%d damage against fire-immune enemies", + "tooltip.mithril.tool": "Melee hits blind undead and inflict Wither for 3 seconds", + "tooltip.starsteel.tool": "Repairs itself while held: 1 durability every %d seconds", + "tooltip.adamantine.armor": "Two pieces grant Resistance I; a full suit grants Resistance II", + "tooltip.aquarium.armor": "Full suit in water: breathe underwater, resist damage and remove Mining Fatigue", + "tooltip.coldiron.armor": "Full suit: Fire Resistance", + "tooltip.mithril.armor": "Full suit: removes harmful potion effects", + "tooltip.starsteel.armor": "Jump higher with each piece; two or more pieces also boost speed", "advancements.basemetals.this_is_new.title": "This is new...", "advancements.basemetals.blocktastic.title": "Blocktastic!", "advancements.basemetals.geologist.title": "Geologist", @@ -406,14 +406,14 @@ "advancements.basemetals.moon_boots.title": "Moon Walker", "advancements.basemetals.this_is_new.description": "Smelt a new metal from the Base Metals mod", "advancements.basemetals.blocktastic.description": "Place a metal block that is neither iron nor gold", - "advancements.basemetals.geologist.description": "Make a hammer from a metal block", + "advancements.basemetals.geologist.description": "Craft a Crack Hammer", "advancements.basemetals.brass_maker.description": "Combine powdered copper and zinc to make brass", "advancements.basemetals.bronze_maker.description": "Combine powdered copper and tin to make bronze", "advancements.basemetals.electrum_maker.description": "Combine powdered silver and gold to make electrum", - "advancements.basemetals.steel_maker.description": "Combine powdered iron and powdered charcoal to make steel", + "advancements.basemetals.steel_maker.description": "Smelt Steel from a blend of iron and coal powders", "advancements.basemetals.invar_maker.description": "Combine powdered iron and nickel to make invar", "advancements.basemetals.mithril_maker.description": "Combine powdered silver, cold-iron and mercury to make mithril", - "advancements.basemetals.aquarium_maker.description": "Combine powdered copper and zinc with prismarine crystals to make aquarium", + "advancements.basemetals.aquarium_maker.description": "Smelt Aquarium from a blend of copper, zinc and prismarine powders", "advancements.basemetals.metallurgy.description": "Craft any alloy blend", "advancements.basemetals.demon_slayer.description": "Wear a full suit of cold-iron armor and wield a cold-iron sword", "advancements.basemetals.angel_of_death.description": "Wear a full suit of mithril armor and wield a mithril sword", @@ -798,8 +798,8 @@ "block.basemetals.steel": "Molten Steel", "block.basemetals.tin": "Molten Tin", "block.basemetals.zinc": "Molten Zinc", - "block.basemetals.charcoal": "Molten Charcoal", - "block.basemetals.coal": "Molten Coal", + "block.basemetals.charcoal": "Liquefied Charcoal", + "block.basemetals.coal": "Liquefied Coal", "block.basemetals.diamond": "Molten Diamond", "block.basemetals.emerald": "Molten Emerald", "block.basemetals.ender": "Molten Ender", @@ -1576,5 +1576,30 @@ "slurry.basemetals.clean_zinc": "Clean Zinc Slurry", "advancements.basemetals.cupronickel_maker.title": "Cupronickel Maker", "advancements.basemetals.pewter_maker.title": "Pewter Maker", - "advancements.basemetals.pewter_maker.description": "Progress through Base Metals: Pewter Maker." -} \ No newline at end of file + "advancements.basemetals.pewter_maker.description": "Smelt Pewter from a blend of tin, copper and lead powders", + "config.basemetals.title": "Base Metals Settings", + "config.basemetals.contentMode": "Content mode", + "config.basemetals.contentMode.tooltip": "Choose how freely you can craft with metals. Ore generation stays the same.", + "config.basemetals.content_mode.high_fantasy": "High Fantasy", + "config.basemetals.content_mode.low_fantasy": "Low Fantasy", + "config.basemetals.content_mode.high_fantasy.description": "Craft freely with every metal. All recipes, villager trades and chest loot are available.", + "config.basemetals.content_mode.low_fantasy.description": "Keep fantasy metals, but limit what you can make from each material. No Base Metals bows, crossbows or fishing rods.", + "config.basemetals.specialEffects": "Special equipment effects", + "config.basemetals.specialEffects.tooltip": "Give certain metals their special armour and melee bonuses, such as breathing underwater in a full Aquarium suit.", + "config.basemetals.starsteelRegeneration": "Starsteel self-repair", + "config.basemetals.starsteelRegeneration.tooltip": "Starsteel equipment repairs itself while held: 1 durability every 10 seconds. Armour does not self-repair.", + "config.basemetals.mercuryImmersionEffects": "Mercury poisoning", + "config.basemetals.mercuryImmersionEffects.tooltip": "Touching liquid mercury can make you nauseous.", + "config.basemetals.villagerTrades": "Villager trades", + "config.basemetals.villagerTrades.tooltip": "Let blacksmiths sell Base Metals ingots and equipment.", + "config.basemetals.defaults": "Defaults", + "config.basemetals.undo": "Undo", + "config.basemetals.confirm.title": "Change content mode?", + "config.basemetals.confirm.message": "Restart Minecraft to use the new mode. You can still use everything you already own. To play on a server, choose the same mode as the server.", + "config.basemetals.restart": "Restart Minecraft after changing modes. This choice applies to all your worlds. Use OreSpawn to change where ores generate.", + "config.basemetals.connection.mismatch": "This server uses %s, but your game uses %s. Choose the same content mode in Mods → Base Metals → Config, then restart Minecraft.", + "fluid.basemetals.coal.name": "Liquefied Coal", + "item.bucket.coal": "Bucket of Liquefied Coal", + "fluid.basemetals.charcoal.name": "Liquefied Charcoal", + "item.bucket.charcoal": "Bucket of Liquefied Charcoal" +} diff --git a/src/generated/resources/assets/basemetals/lang/en_pt.json b/src/generated/resources/assets/basemetals/lang/en_pt.json index 3bb1f115..3faf38d6 100644 --- a/src/generated/resources/assets/basemetals/lang/en_pt.json +++ b/src/generated/resources/assets/basemetals/lang/en_pt.json @@ -360,33 +360,33 @@ "block.basemetals.tin_trapdoor": "Tin Trapdoor", "block.basemetals.zinc_block": "Zinc Block", "block.basemetals.zinc_ore": "Zinc Ore", - "block.basemetals.aquarium_plate": "Plate o\u0027 Fish-Steel", - "block.basemetals.brass_plate": "Plate o\u0027 Brass", - "block.basemetals.bronze_plate": "Bronze Plate o\u0027", - "block.basemetals.coldiron_plate": "Plate o\u0027 Devil-Iron", - "block.basemetals.copper_plate": "Plate o\u0027 Copper", - "block.basemetals.electrum_plate": "Plate o\u0027 Electrum", - "block.basemetals.invar_plate": "Plate o\u0027 Invar", - "block.basemetals.lead_plate": "Plate o\u0027 Lead", - "block.basemetals.mithril_plate": "Plate o\u0027 Ghost Silver", - "block.basemetals.nickel_plate": "Plate o\u0027 Nickel", - "block.basemetals.silver_plate": "Plate o\u0027 Silver", - "block.basemetals.starsteel_plate": "Plate o\u0027 Starsteel", - "block.basemetals.steel_plate": "Plate o\u0027 Steel", - "block.basemetals.tin_plate": "Plate o\u0027 Tin", - "block.basemetals.zinc_plate": "Plate o\u0027 Zinc", - "block.basemetals.iron_plate": "Plate o\u0027 Iron", - "block.basemetals.gold_plate": "Plate o\u0027 Gold", - "tooltip.adamantine.tool": "Hurts th\u0027 giants +%x more", - "tooltip.aquarium.tool": "Hurts th\u0027 fish +%x more", - "tooltip.coldiron.tool": "Hurts th\u0027 devils +%x more", - "tooltip.mithril.tool": "Kiss o\u0027 Davey Jones", - "tooltip.starsteel.tool": "It fixes itself", - "tooltip.adamantine.armor": "Hurts less", - "tooltip.aquarium.armor": "Gives ya gills", - "tooltip.coldiron.armor": "Become a devil", - "tooltip.mithril.armor": "Protect\u0027s yer tummy", - "tooltip.starsteel.armor": "Ye can fly (sorta)", + "block.basemetals.aquarium_plate": "Plate o' Fish-Steel", + "block.basemetals.brass_plate": "Plate o' Brass", + "block.basemetals.bronze_plate": "Bronze Plate o'", + "block.basemetals.coldiron_plate": "Plate o' Devil-Iron", + "block.basemetals.copper_plate": "Plate o' Copper", + "block.basemetals.electrum_plate": "Plate o' Electrum", + "block.basemetals.invar_plate": "Plate o' Invar", + "block.basemetals.lead_plate": "Plate o' Lead", + "block.basemetals.mithril_plate": "Plate o' Ghost Silver", + "block.basemetals.nickel_plate": "Plate o' Nickel", + "block.basemetals.silver_plate": "Plate o' Silver", + "block.basemetals.starsteel_plate": "Plate o' Starsteel", + "block.basemetals.steel_plate": "Plate o' Steel", + "block.basemetals.tin_plate": "Plate o' Tin", + "block.basemetals.zinc_plate": "Plate o' Zinc", + "block.basemetals.iron_plate": "Plate o' Iron", + "block.basemetals.gold_plate": "Plate o' Gold", + "tooltip.adamantine.tool": "Melee hits: +%d damage against enemies with more than 10 hearts of maximum health", + "tooltip.aquarium.tool": "Melee hits: +%d damage against enemies that breathe underwater", + "tooltip.coldiron.tool": "Melee hits: +%d damage against fire-immune enemies", + "tooltip.mithril.tool": "Melee hits blind undead and inflict Wither for 3 seconds", + "tooltip.starsteel.tool": "Repairs itself while held: 1 durability every %d seconds", + "tooltip.adamantine.armor": "Two pieces grant Resistance I; a full suit grants Resistance II", + "tooltip.aquarium.armor": "Full suit in water: breathe underwater, resist damage and remove Mining Fatigue", + "tooltip.coldiron.armor": "Full suit: Fire Resistance", + "tooltip.mithril.armor": "Full suit: removes harmful potion effects", + "tooltip.starsteel.armor": "Jump higher with each piece; two or more pieces also boost speed", "advancements.basemetals.this_is_new.title": "This is new...", "advancements.basemetals.blocktastic.title": "Blocktastic!", "advancements.basemetals.geologist.title": "Geologist", @@ -405,14 +405,14 @@ "advancements.basemetals.moon_boots.title": "Moon Walker", "advancements.basemetals.this_is_new.description": "Smelt a new metal from the Base Metals mod", "advancements.basemetals.blocktastic.description": "Place a metal block that is neither iron nor gold", - "advancements.basemetals.geologist.description": "Make a hammer from a metal block", + "advancements.basemetals.geologist.description": "Craft a Crack Hammer", "advancements.basemetals.brass_maker.description": "Combine powdered copper and zinc to make brass", "advancements.basemetals.bronze_maker.description": "Combine powdered copper and tin to make bronze", "advancements.basemetals.electrum_maker.description": "Combine powdered silver and gold to make electrum", - "advancements.basemetals.steel_maker.description": "Combine powdered iron and powdered charcoal to make steel", + "advancements.basemetals.steel_maker.description": "Smelt Steel from a blend of iron and coal powders", "advancements.basemetals.invar_maker.description": "Combine powdered iron and nickel to make invar", "advancements.basemetals.mithril_maker.description": "Combine powdered silver, devil-iron and mercury to make ghost silver", - "advancements.basemetals.aquarium_maker.description": "Combine powdered copper and zinc with prismarine crystals to make fish-steel", + "advancements.basemetals.aquarium_maker.description": "Smelt Aquarium from a blend of copper, zinc and prismarine powders", "advancements.basemetals.metallurgy.description": "Craft any alloy blend", "advancements.basemetals.demon_slayer.description": "Wear a full suit of devil-iron armor and wield a cold-iron sword", "advancements.basemetals.angel_of_death.description": "Wear a full suit of ghost silver armor and wield a mithril sword", @@ -421,7 +421,7 @@ "advancements.basemetals.moon_boots.description": "Wear a pair of star-steel boots", "item.basemetals.diamond_crackhammer": "Diamond Crack Hammer", "item.basemetals.wood_crackhammer": "Wooden Crack Hammer", - "item.bucket.mercury": "Bucket o\u0027 Quicksilver", + "item.bucket.mercury": "Bucket o' Quicksilver", "fluid.basemetals.mercury": "Quicksilver", "item.basemetals.human_detector": "Secret Floor Button", "advancements.basemetals.cupronickel_maker.description": "Combine powdered copper and nickel to make cupronickel", @@ -760,8 +760,8 @@ "block.basemetals.steel": "Molten Steel", "block.basemetals.tin": "Molten Tin", "block.basemetals.zinc": "Molten Zinc", - "block.basemetals.charcoal": "Molten Charcoal", - "block.basemetals.coal": "Molten Coal", + "block.basemetals.charcoal": "Liquefied Charcoal", + "block.basemetals.coal": "Liquefied Coal", "block.basemetals.diamond": "Molten Diamond", "block.basemetals.emerald": "Molten Emerald", "block.basemetals.ender": "Molten Ender", @@ -1567,5 +1567,30 @@ "slurry.basemetals.clean_zinc": "Clean Zinc Slurry", "advancements.basemetals.cupronickel_maker.title": "Cupronickel Maker", "advancements.basemetals.pewter_maker.title": "Pewter Maker", - "advancements.basemetals.pewter_maker.description": "Progress through Base Metals: Pewter Maker." -} \ No newline at end of file + "advancements.basemetals.pewter_maker.description": "Smelt Pewter from a blend of tin, copper and lead powders", + "config.basemetals.title": "Base Metals Settings", + "config.basemetals.contentMode": "Content mode", + "config.basemetals.contentMode.tooltip": "Choose how freely you can craft with metals. Ore generation stays the same.", + "config.basemetals.content_mode.high_fantasy": "High Fantasy", + "config.basemetals.content_mode.low_fantasy": "Low Fantasy", + "config.basemetals.content_mode.high_fantasy.description": "Craft freely with every metal. All recipes, villager trades and chest loot are available.", + "config.basemetals.content_mode.low_fantasy.description": "Keep fantasy metals, but limit what you can make from each material. No Base Metals bows, crossbows or fishing rods.", + "config.basemetals.specialEffects": "Special equipment effects", + "config.basemetals.specialEffects.tooltip": "Give certain metals their special armour and melee bonuses, such as breathing underwater in a full Aquarium suit.", + "config.basemetals.starsteelRegeneration": "Starsteel self-repair", + "config.basemetals.starsteelRegeneration.tooltip": "Starsteel equipment repairs itself while held: 1 durability every 10 seconds. Armour does not self-repair.", + "config.basemetals.mercuryImmersionEffects": "Mercury poisoning", + "config.basemetals.mercuryImmersionEffects.tooltip": "Touching liquid mercury can make you nauseous.", + "config.basemetals.villagerTrades": "Villager trades", + "config.basemetals.villagerTrades.tooltip": "Let blacksmiths sell Base Metals ingots and equipment.", + "config.basemetals.defaults": "Defaults", + "config.basemetals.undo": "Undo", + "config.basemetals.confirm.title": "Change content mode?", + "config.basemetals.confirm.message": "Restart Minecraft to use the new mode. You can still use everything you already own. To play on a server, choose the same mode as the server.", + "config.basemetals.restart": "Restart Minecraft after changing modes. This choice applies to all your worlds. Use OreSpawn to change where ores generate.", + "config.basemetals.connection.mismatch": "This server uses %s, but your game uses %s. Choose the same content mode in Mods → Base Metals → Config, then restart Minecraft.", + "fluid.basemetals.coal.name": "Liquefied Coal", + "item.bucket.coal": "Bucket of Liquefied Coal", + "fluid.basemetals.charcoal.name": "Liquefied Charcoal", + "item.bucket.charcoal": "Bucket of Liquefied Charcoal" +} diff --git a/src/generated/resources/assets/basemetals/lang/en_us.json b/src/generated/resources/assets/basemetals/lang/en_us.json index a4b82a96..e380dba9 100644 --- a/src/generated/resources/assets/basemetals/lang/en_us.json +++ b/src/generated/resources/assets/basemetals/lang/en_us.json @@ -4,16 +4,16 @@ "itemGroup.basemetals.combat": "Base Metals Combat", "itemGroup.basemetals.items": "Base Metals Items", "itemGroup.basemetals.tools": "Base Metals Tools", - "tooltip.adamantine.tool": "+%d damage against tough enemies", - "tooltip.adamantine.armor": "Reduces damage taken", - "tooltip.aquarium.tool": "+%d damage against aquatic enemies", - "tooltip.aquarium.armor": "Full suit: breathe underwater", - "tooltip.coldiron.tool": "+%d damage against fiery enemies", - "tooltip.coldiron.armor": "Full suit: fire immunity", - "tooltip.mithril.tool": "Blinds and withers undead", - "tooltip.mithril.armor": "Full suit: protection from poison \u0026 wither", - "tooltip.starsteel.tool": "Repairs 1 damage every %d seconds", - "tooltip.starsteel.armor": "Reduces your weight", + "tooltip.adamantine.tool": "Melee hits: +%d damage against enemies with more than 10 hearts of maximum health", + "tooltip.adamantine.armor": "Two pieces grant Resistance I; a full suit grants Resistance II", + "tooltip.aquarium.tool": "Melee hits: +%d damage against enemies that breathe underwater", + "tooltip.aquarium.armor": "Full suit in water: breathe underwater, resist damage and remove Mining Fatigue", + "tooltip.coldiron.tool": "Melee hits: +%d damage against fire-immune enemies", + "tooltip.coldiron.armor": "Full suit: Fire Resistance", + "tooltip.mithril.tool": "Melee hits blind undead and inflict Wither for 3 seconds", + "tooltip.mithril.armor": "Full suit: removes harmful potion effects", + "tooltip.starsteel.tool": "Repairs itself while held: 1 durability every %d seconds", + "tooltip.starsteel.armor": "Jump higher with each piece; two or more pieces also boost speed", "advancements.basemetals.aquarium_maker.title": "Aquarium", "advancements.basemetals.angel_of_death.title": "Angel of Death", "advancements.basemetals.brass_maker.title": "Brass", @@ -32,7 +32,7 @@ "advancements.basemetals.scuba_diver.title": "SCUBA Diver", "advancements.basemetals.steel_maker.title": "Steel", "advancements.basemetals.this_is_new.title": "This is new...", - "advancements.basemetals.aquarium_maker.description": "Combine powdered copper and zinc with prismarine crystals to make aquarium", + "advancements.basemetals.aquarium_maker.description": "Smelt Aquarium from a blend of copper, zinc and prismarine powders", "advancements.basemetals.angel_of_death.description": "Wear a full suit of mithril armor and wield a mithril sword", "advancements.basemetals.brass_maker.description": "Combine powdered copper and zinc to make brass", "advancements.basemetals.bronze_maker.description": "Combine powdered copper and tin to make bronze", @@ -40,15 +40,15 @@ "advancements.basemetals.cupronickel_maker.description": "Combine powdered copper and nickel to make cupronickel", "advancements.basemetals.demon_slayer.description": "Wear a full suit of cold-iron armor and wield a cold-iron sword", "advancements.basemetals.electrum_maker.description": "Combine powdered silver and gold to make electrum", - "advancements.basemetals.geologist.description": "Make a hammer from a metal block", + "advancements.basemetals.geologist.description": "Craft a Crack Hammer", "advancements.basemetals.invar_maker.description": "Combine powdered iron and nickel to make invar", "advancements.basemetals.juggernaut.description": "Wear a full suit of adamantine armor", "advancements.basemetals.metallurgy.description": "Craft any alloy blend", "advancements.basemetals.mithril_maker.description": "Combine powdered silver, cold-iron and mercury to make mithril", - "advancements.basemetals.pewter_maker.description": "Combine powdered ??? and ??? to make pewter", + "advancements.basemetals.pewter_maker.description": "Smelt Pewter from a blend of tin, copper and lead powders", "advancements.basemetals.moon_boots.description": "Wear a pair of star-steel boots", "advancements.basemetals.scuba_diver.description": "Wear a full suit of aquarium armor and swim under water", - "advancements.basemetals.steel_maker.description": "Combine powdered iron and powdered charcoal to make steel", + "advancements.basemetals.steel_maker.description": "Smelt Steel from a blend of iron and coal powders", "advancements.basemetals.this_is_new.description": "Smelt a new metal from the Base Metals mod", "item.basemetals.adamantine_axe": "Adamantine Axe", "item.basemetals.aquarium_axe": "Aquarium Axe", @@ -875,8 +875,8 @@ "fluid.basemetals.bismuth.name": "Molten Bismuth", "fluid.basemetals.brass.name": "Molten Brass", "fluid.basemetals.bronze.name": "Molten Bronze", - "fluid.basemetals.charcoal.name": "Liquifacted Charcoal", - "fluid.basemetals.coal.name": "Liquifacted Coal", + "fluid.basemetals.charcoal.name": "Liquefied Charcoal", + "fluid.basemetals.coal.name": "Liquefied Coal", "fluid.basemetals.coldiron.name": "Molten Cold-Iron", "fluid.basemetals.copper.name": "Molten Copper", "fluid.basemetals.cupronickel.name": "Molten Cupronickel", @@ -903,8 +903,8 @@ "block.basemetals.bismuth": "Molten Bismuth", "block.basemetals.brass": "Molten Brass", "block.basemetals.bronze": "Molten Bronze", - "block.basemetals.charcoal": "Liquifacted Charcoal", - "block.basemetals.coal": "Liquifacted Coal", + "block.basemetals.charcoal": "Liquefied Charcoal", + "block.basemetals.coal": "Liquefied Coal", "block.basemetals.coldiron": "Molten Cold-Iron", "block.basemetals.copper": "Molten Copper", "block.basemetals.cupronickel": "Molten Cupronickel", @@ -935,8 +935,8 @@ "item.bucket.bismuth": "Bucket of Molten Bismuth", "item.bucket.brass": "Bucket of Molten Brass", "item.bucket.bronze": "Bucket of Molten Bronze", - "item.bucket.charcoal": "Bucket of Liquifacted Charcoal", - "item.bucket.coal": "Bucket of Liquifacted Coal", + "item.bucket.charcoal": "Bucket of Liquefied Charcoal", + "item.bucket.coal": "Bucket of Liquefied Coal", "item.bucket.coldiron": "Bucket of Molten Cold-Iron", "item.bucket.copper": "Bucket of Molten Copper", "item.bucket.cupronickel": "Bucket of Molten Cupronickel", @@ -1667,15 +1667,15 @@ "modifier.mmd-brittle.name": "Brittle", "modifier.mmd-brittle.desc": "As it breaks down it does more damage - but beware, it will hurt you as well!", "modifier.mmd-heavy.name": "Heavy", - "modifier.mmd-heavy.desc": "This stuff is really, really dense - it\u0027ll tire you out faster to use any tools made from this", + "modifier.mmd-heavy.desc": "This stuff is really, really dense - it'll tire you out faster to use any tools made from this", "modifier.mmd-reactive.name": "Reactive", "modifier.mmd-reactive.desc": "Reacts with water to wear out faster", "modifier.mmd-radioactive.name": "Radioactive", "modifier.mmd-radioactive.desc": "Dangerous to hold and use unless you can somehow shield yourself from the effects.", "modifier.toxic-modifier.name": "Toxic", - "modifier.toxic-modifier.desc": "§oTOXIC AVENGER!§r\\nMercury and it\u0027s ethyl and methyl salts are extremely toxic and have neuro-degenerative effects.\\nAdding some to a weapon or tool gives it the ability to poison and temporarily blind your enemies.", + "modifier.toxic-modifier.desc": "§oTOXIC AVENGER!§r\\nMercury and it's ethyl and methyl salts are extremely toxic and have neuro-degenerative effects.\\nAdding some to a weapon or tool gives it the ability to poison and temporarily blind your enemies.", "modifier.lead-plated.name": "Lead Plated", - "modifier.lead-plated.desc": "§oSafety First§r\\nIf you\u0027ve got some Plutonium or Uranium around and think it\u0027d be great for a weapon, don\u0027t forget to add some shielding.\\nA nice lead plate will stop the deadly radiation from affection you while still letting it harm your enemies.", + "modifier.lead-plated.desc": "§oSafety First§r\\nIf you've got some Plutonium or Uranium around and think it'd be great for a weapon, don't forget to add some shielding.\\nA nice lead plate will stop the deadly radiation from affection you while still letting it harm your enemies.", "modifier.mmd-poisonous_armor.name": "Poisonous", "modifier.mmd-poisonous_armor.desc": "Rather dangerous - will poison things when hit by them.", "modifier.mmd-toxic_armor.name": "Toxic", @@ -1687,11 +1687,11 @@ "modifier.mmd-sparkly.name": "Sparkly", "modifier.mmd-sparkly.desc": "Self-Repairing, shiny and sparkly stuff", "modifier.mmd-soft.name": "Soft", - "modifier.mmd-soft.desc": "Not really good for tools that will see a lot of use as they\u0027ll wear out faster", + "modifier.mmd-soft.desc": "Not really good for tools that will see a lot of use as they'll wear out faster", "modifier.mmd-icy_armor.name": "Eternal Ice", "modifier.mmd-icy_armor.desc": "This material is so cold not even the ever burning fires of the Nether can make you sweat", "modifier.mmd-malleable_armor.name": "Malleable", - "modifier.mmd-malleable_armor.desc": "Perhaps appropriate for armors that will see a lot of use as they\u0027ll wear out slower", + "modifier.mmd-malleable_armor.desc": "Perhaps appropriate for armors that will see a lot of use as they'll wear out slower", "block.basemetals.steel_anvil.intact": "Steel Anvil", "block.basemetals.steel_anvil.slightlyDamaged": "Slightly Damaged Steel Anvil", "block.basemetals.steel_anvil.veryDamaged": "Badly Damaged Steel Anvil", @@ -1869,5 +1869,26 @@ "slurry.basemetals.dirty_starsteel": "Dirty Starsteel Slurry", "slurry.basemetals.clean_starsteel": "Clean Starsteel Slurry", "slurry.basemetals.dirty_zinc": "Dirty Zinc Slurry", - "slurry.basemetals.clean_zinc": "Clean Zinc Slurry" -} \ No newline at end of file + "slurry.basemetals.clean_zinc": "Clean Zinc Slurry", + "config.basemetals.title": "Base Metals Settings", + "config.basemetals.contentMode": "Content mode", + "config.basemetals.contentMode.tooltip": "Choose how freely you can craft with metals. Ore generation stays the same.", + "config.basemetals.content_mode.high_fantasy": "High Fantasy", + "config.basemetals.content_mode.low_fantasy": "Low Fantasy", + "config.basemetals.content_mode.high_fantasy.description": "Craft freely with every metal. All recipes, villager trades and chest loot are available.", + "config.basemetals.content_mode.low_fantasy.description": "Keep fantasy metals, but limit what you can make from each material. No Base Metals bows, crossbows or fishing rods.", + "config.basemetals.specialEffects": "Special equipment effects", + "config.basemetals.specialEffects.tooltip": "Give certain metals their special armour and melee bonuses, such as breathing underwater in a full Aquarium suit.", + "config.basemetals.starsteelRegeneration": "Starsteel self-repair", + "config.basemetals.starsteelRegeneration.tooltip": "Starsteel equipment repairs itself while held: 1 durability every 10 seconds. Armour does not self-repair.", + "config.basemetals.mercuryImmersionEffects": "Mercury poisoning", + "config.basemetals.mercuryImmersionEffects.tooltip": "Touching liquid mercury can make you nauseous.", + "config.basemetals.villagerTrades": "Villager trades", + "config.basemetals.villagerTrades.tooltip": "Let blacksmiths sell Base Metals ingots and equipment.", + "config.basemetals.defaults": "Defaults", + "config.basemetals.undo": "Undo", + "config.basemetals.confirm.title": "Change content mode?", + "config.basemetals.confirm.message": "Restart Minecraft to use the new mode. You can still use everything you already own. To play on a server, choose the same mode as the server.", + "config.basemetals.restart": "Restart Minecraft after changing modes. This choice applies to all your worlds. Use OreSpawn to change where ores generate.", + "config.basemetals.connection.mismatch": "This server uses %s, but your game uses %s. Choose the same content mode in Mods → Base Metals → Config, then restart Minecraft." +} diff --git a/src/generated/resources/assets/basemetals/lang/es_es.json b/src/generated/resources/assets/basemetals/lang/es_es.json index f39728cd..27d13fb7 100644 --- a/src/generated/resources/assets/basemetals/lang/es_es.json +++ b/src/generated/resources/assets/basemetals/lang/es_es.json @@ -380,16 +380,16 @@ "block.basemetals.zinc_plate": "Placa de zinc", "block.basemetals.iron_plate": "Placa de hierro", "block.basemetals.gold_plate": "Placa de oro", - "tooltip.adamantine.tool": "+%x daño a enemigos poderosos", - "tooltip.aquarium.tool": "+%x daño a enemigos acuáticos", - "tooltip.coldiron.tool": "+%x daño a enemigos ardientes", - "tooltip.mithril.tool": "Ciega y marchita a no-muertos", - "tooltip.starsteel.tool": "Repara 1 de daño cada %x segundos", - "tooltip.adamantine.armor": "Reduce el daño recibido", - "tooltip.aquarium.armor": "Armadura completa: respira bajo el agua", - "tooltip.coldiron.armor": "Armadura completa: inmune al fuego", - "tooltip.mithril.armor": "Aramadura completa: protección contra veneno y wither", - "tooltip.starsteel.armor": "Reduce tu peso", + "tooltip.adamantine.tool": "Golpes cuerpo a cuerpo: +%d de daño contra enemigos con más de 10 corazones de salud máxima", + "tooltip.aquarium.tool": "Golpes cuerpo a cuerpo: +%d de daño contra enemigos que respiran bajo el agua", + "tooltip.coldiron.tool": "Golpes cuerpo a cuerpo: +%d de daño contra enemigos inmunes al fuego", + "tooltip.mithril.tool": "Los golpes cuerpo a cuerpo ciegan a los no muertos y causan Wither durante 3 segundos", + "tooltip.starsteel.tool": "Se repara mientras lo sostienes: 1 punto de durabilidad cada %d segundos", + "tooltip.adamantine.armor": "Dos piezas dan Resistencia I; la armadura completa da Resistencia II", + "tooltip.aquarium.armor": "Armadura completa en el agua: respiración acuática, resistencia y elimina la fatiga minera", + "tooltip.coldiron.armor": "Armadura completa: Resistencia al fuego", + "tooltip.mithril.armor": "Armadura completa: elimina efectos de poción dañinos", + "tooltip.starsteel.armor": "Salta más alto con cada pieza; dos o más también aumentan la velocidad", "advancements.basemetals.this_is_new.title": "Esta es la nueva ...", "advancements.basemetals.blocktastic.title": "¡Bloque!", "advancements.basemetals.geologist.title": "Geólogo", @@ -408,14 +408,14 @@ "advancements.basemetals.moon_boots.title": "Moon Walker", "advancements.basemetals.this_is_new.description": "Funde un nuevo metal del mod Base Metals", "advancements.basemetals.blocktastic.description": "Colocar un bloque de un metal que no sea hierro ni oro", - "advancements.basemetals.geologist.description": "Fabrica una almádena de un bloque de metal", + "advancements.basemetals.geologist.description": "Fabrica un Crack Hammer", "advancements.basemetals.brass_maker.description": "Combina polvo de cobre y zinc para hacer latón", "advancements.basemetals.bronze_maker.description": "Combina polvo cobre y estaño para hacer bronce", "advancements.basemetals.electrum_maker.description": "Combina polvo plata y oro para hacer electrio", - "advancements.basemetals.steel_maker.description": "Combina polvo de hierro y polvo de carbón para fabricar acero", + "advancements.basemetals.steel_maker.description": "Funde acero a partir de una mezcla de polvos de hierro y carbón", "advancements.basemetals.invar_maker.description": "Combina polvo de hierro y níquel para hacer invar", "advancements.basemetals.mithril_maker.description": "Combina polvo de plata, glacierro y mercurio para hacer mithril", - "advancements.basemetals.aquarium_maker.description": "Combina polvo de cobre y zinc con cristales de prismarina para hacer aquaranio", + "advancements.basemetals.aquarium_maker.description": "Funde Aquarium a partir de una mezcla de polvos de cobre, zinc y prismarina", "advancements.basemetals.metallurgy.description": "Fabrica cualquier mezcla de aleación", "advancements.basemetals.demon_slayer.description": "Viste una armadura completa de glacierro y blande una espada de glacierro", "advancements.basemetals.angel_of_death.description": "Viste una armadura completa de mithril y blande una espada de mithril", @@ -761,8 +761,8 @@ "block.basemetals.steel": "Molten Steel", "block.basemetals.tin": "Molten Tin", "block.basemetals.zinc": "Molten Zinc", - "block.basemetals.charcoal": "Molten Charcoal", - "block.basemetals.coal": "Molten Coal", + "block.basemetals.charcoal": "Carbón vegetal licuado", + "block.basemetals.coal": "Carbón licuado", "block.basemetals.diamond": "Molten Diamond", "block.basemetals.emerald": "Molten Emerald", "block.basemetals.ender": "Molten Ender", @@ -1568,5 +1568,30 @@ "slurry.basemetals.clean_zinc": "Clean Zinc Slurry", "advancements.basemetals.cupronickel_maker.title": "Cupronickel Maker", "advancements.basemetals.pewter_maker.title": "Pewter Maker", - "advancements.basemetals.pewter_maker.description": "Progress through Base Metals: Pewter Maker." -} \ No newline at end of file + "advancements.basemetals.pewter_maker.description": "Funde peltre a partir de una mezcla de polvos de estaño, cobre y plomo", + "config.basemetals.title": "Ajustes de Base Metals", + "config.basemetals.contentMode": "Modo de contenido", + "config.basemetals.contentMode.tooltip": "Elige cuánta libertad tienes al fabricar con metales. La generación de minerales no cambia.", + "config.basemetals.content_mode.high_fantasy": "Alta fantasía", + "config.basemetals.content_mode.low_fantasy": "Baja fantasía", + "config.basemetals.content_mode.high_fantasy.description": "Fabrica libremente con todos los metales. Todas las recetas, los intercambios y el botín de cofres están disponibles.", + "config.basemetals.content_mode.low_fantasy.description": "Conserva los metales fantásticos, pero limita lo que puedes fabricar con cada material. Sin arcos, ballestas ni cañas de pesca de Base Metals.", + "config.basemetals.specialEffects": "Efectos especiales del equipo", + "config.basemetals.specialEffects.tooltip": "Da a ciertos metales efectos especiales de armadura y combate, como respirar bajo el agua con una armadura completa de Aquarium.", + "config.basemetals.starsteelRegeneration": "Autorreparación del acero estelar", + "config.basemetals.starsteelRegeneration.tooltip": "El equipo de acero estelar se repara mientras lo sostienes: 1 punto de durabilidad cada 10 segundos. La armadura no se autorrepara.", + "config.basemetals.mercuryImmersionEffects": "Intoxicación por mercurio", + "config.basemetals.mercuryImmersionEffects.tooltip": "Tocar mercurio líquido puede causar náuseas.", + "config.basemetals.villagerTrades": "Intercambios con aldeanos", + "config.basemetals.villagerTrades.tooltip": "Permite que los herreros vendan lingotes y equipo de Base Metals.", + "config.basemetals.defaults": "Valores predeterminados", + "config.basemetals.undo": "Deshacer", + "config.basemetals.confirm.title": "¿Cambiar el modo de contenido?", + "config.basemetals.confirm.message": "Reinicia Minecraft para usar el nuevo modo. Puedes seguir usando todo lo que ya tienes. Para jugar en un servidor, elige el mismo modo que el servidor.", + "config.basemetals.restart": "Reinicia Minecraft tras cambiar de modo. Esta elección se aplica a todos tus mundos. Usa OreSpawn para cambiar dónde se generan los minerales.", + "config.basemetals.connection.mismatch": "Este servidor usa %s, pero tu juego usa %s. Elige el mismo modo en Mods → Base Metals → Config y reinicia Minecraft.", + "fluid.basemetals.coal.name": "Carbón licuado", + "item.bucket.coal": "Cubo de carbón licuado", + "fluid.basemetals.charcoal.name": "Carbón vegetal licuado", + "item.bucket.charcoal": "Cubo de carbón vegetal licuado" +} diff --git a/src/generated/resources/assets/basemetals/lang/es_mx.json b/src/generated/resources/assets/basemetals/lang/es_mx.json index f39728cd..27d13fb7 100644 --- a/src/generated/resources/assets/basemetals/lang/es_mx.json +++ b/src/generated/resources/assets/basemetals/lang/es_mx.json @@ -380,16 +380,16 @@ "block.basemetals.zinc_plate": "Placa de zinc", "block.basemetals.iron_plate": "Placa de hierro", "block.basemetals.gold_plate": "Placa de oro", - "tooltip.adamantine.tool": "+%x daño a enemigos poderosos", - "tooltip.aquarium.tool": "+%x daño a enemigos acuáticos", - "tooltip.coldiron.tool": "+%x daño a enemigos ardientes", - "tooltip.mithril.tool": "Ciega y marchita a no-muertos", - "tooltip.starsteel.tool": "Repara 1 de daño cada %x segundos", - "tooltip.adamantine.armor": "Reduce el daño recibido", - "tooltip.aquarium.armor": "Armadura completa: respira bajo el agua", - "tooltip.coldiron.armor": "Armadura completa: inmune al fuego", - "tooltip.mithril.armor": "Aramadura completa: protección contra veneno y wither", - "tooltip.starsteel.armor": "Reduce tu peso", + "tooltip.adamantine.tool": "Golpes cuerpo a cuerpo: +%d de daño contra enemigos con más de 10 corazones de salud máxima", + "tooltip.aquarium.tool": "Golpes cuerpo a cuerpo: +%d de daño contra enemigos que respiran bajo el agua", + "tooltip.coldiron.tool": "Golpes cuerpo a cuerpo: +%d de daño contra enemigos inmunes al fuego", + "tooltip.mithril.tool": "Los golpes cuerpo a cuerpo ciegan a los no muertos y causan Wither durante 3 segundos", + "tooltip.starsteel.tool": "Se repara mientras lo sostienes: 1 punto de durabilidad cada %d segundos", + "tooltip.adamantine.armor": "Dos piezas dan Resistencia I; la armadura completa da Resistencia II", + "tooltip.aquarium.armor": "Armadura completa en el agua: respiración acuática, resistencia y elimina la fatiga minera", + "tooltip.coldiron.armor": "Armadura completa: Resistencia al fuego", + "tooltip.mithril.armor": "Armadura completa: elimina efectos de poción dañinos", + "tooltip.starsteel.armor": "Salta más alto con cada pieza; dos o más también aumentan la velocidad", "advancements.basemetals.this_is_new.title": "Esta es la nueva ...", "advancements.basemetals.blocktastic.title": "¡Bloque!", "advancements.basemetals.geologist.title": "Geólogo", @@ -408,14 +408,14 @@ "advancements.basemetals.moon_boots.title": "Moon Walker", "advancements.basemetals.this_is_new.description": "Funde un nuevo metal del mod Base Metals", "advancements.basemetals.blocktastic.description": "Colocar un bloque de un metal que no sea hierro ni oro", - "advancements.basemetals.geologist.description": "Fabrica una almádena de un bloque de metal", + "advancements.basemetals.geologist.description": "Fabrica un Crack Hammer", "advancements.basemetals.brass_maker.description": "Combina polvo de cobre y zinc para hacer latón", "advancements.basemetals.bronze_maker.description": "Combina polvo cobre y estaño para hacer bronce", "advancements.basemetals.electrum_maker.description": "Combina polvo plata y oro para hacer electrio", - "advancements.basemetals.steel_maker.description": "Combina polvo de hierro y polvo de carbón para fabricar acero", + "advancements.basemetals.steel_maker.description": "Funde acero a partir de una mezcla de polvos de hierro y carbón", "advancements.basemetals.invar_maker.description": "Combina polvo de hierro y níquel para hacer invar", "advancements.basemetals.mithril_maker.description": "Combina polvo de plata, glacierro y mercurio para hacer mithril", - "advancements.basemetals.aquarium_maker.description": "Combina polvo de cobre y zinc con cristales de prismarina para hacer aquaranio", + "advancements.basemetals.aquarium_maker.description": "Funde Aquarium a partir de una mezcla de polvos de cobre, zinc y prismarina", "advancements.basemetals.metallurgy.description": "Fabrica cualquier mezcla de aleación", "advancements.basemetals.demon_slayer.description": "Viste una armadura completa de glacierro y blande una espada de glacierro", "advancements.basemetals.angel_of_death.description": "Viste una armadura completa de mithril y blande una espada de mithril", @@ -761,8 +761,8 @@ "block.basemetals.steel": "Molten Steel", "block.basemetals.tin": "Molten Tin", "block.basemetals.zinc": "Molten Zinc", - "block.basemetals.charcoal": "Molten Charcoal", - "block.basemetals.coal": "Molten Coal", + "block.basemetals.charcoal": "Carbón vegetal licuado", + "block.basemetals.coal": "Carbón licuado", "block.basemetals.diamond": "Molten Diamond", "block.basemetals.emerald": "Molten Emerald", "block.basemetals.ender": "Molten Ender", @@ -1568,5 +1568,30 @@ "slurry.basemetals.clean_zinc": "Clean Zinc Slurry", "advancements.basemetals.cupronickel_maker.title": "Cupronickel Maker", "advancements.basemetals.pewter_maker.title": "Pewter Maker", - "advancements.basemetals.pewter_maker.description": "Progress through Base Metals: Pewter Maker." -} \ No newline at end of file + "advancements.basemetals.pewter_maker.description": "Funde peltre a partir de una mezcla de polvos de estaño, cobre y plomo", + "config.basemetals.title": "Ajustes de Base Metals", + "config.basemetals.contentMode": "Modo de contenido", + "config.basemetals.contentMode.tooltip": "Elige cuánta libertad tienes al fabricar con metales. La generación de minerales no cambia.", + "config.basemetals.content_mode.high_fantasy": "Alta fantasía", + "config.basemetals.content_mode.low_fantasy": "Baja fantasía", + "config.basemetals.content_mode.high_fantasy.description": "Fabrica libremente con todos los metales. Todas las recetas, los intercambios y el botín de cofres están disponibles.", + "config.basemetals.content_mode.low_fantasy.description": "Conserva los metales fantásticos, pero limita lo que puedes fabricar con cada material. Sin arcos, ballestas ni cañas de pesca de Base Metals.", + "config.basemetals.specialEffects": "Efectos especiales del equipo", + "config.basemetals.specialEffects.tooltip": "Da a ciertos metales efectos especiales de armadura y combate, como respirar bajo el agua con una armadura completa de Aquarium.", + "config.basemetals.starsteelRegeneration": "Autorreparación del acero estelar", + "config.basemetals.starsteelRegeneration.tooltip": "El equipo de acero estelar se repara mientras lo sostienes: 1 punto de durabilidad cada 10 segundos. La armadura no se autorrepara.", + "config.basemetals.mercuryImmersionEffects": "Intoxicación por mercurio", + "config.basemetals.mercuryImmersionEffects.tooltip": "Tocar mercurio líquido puede causar náuseas.", + "config.basemetals.villagerTrades": "Intercambios con aldeanos", + "config.basemetals.villagerTrades.tooltip": "Permite que los herreros vendan lingotes y equipo de Base Metals.", + "config.basemetals.defaults": "Valores predeterminados", + "config.basemetals.undo": "Deshacer", + "config.basemetals.confirm.title": "¿Cambiar el modo de contenido?", + "config.basemetals.confirm.message": "Reinicia Minecraft para usar el nuevo modo. Puedes seguir usando todo lo que ya tienes. Para jugar en un servidor, elige el mismo modo que el servidor.", + "config.basemetals.restart": "Reinicia Minecraft tras cambiar de modo. Esta elección se aplica a todos tus mundos. Usa OreSpawn para cambiar dónde se generan los minerales.", + "config.basemetals.connection.mismatch": "Este servidor usa %s, pero tu juego usa %s. Elige el mismo modo en Mods → Base Metals → Config y reinicia Minecraft.", + "fluid.basemetals.coal.name": "Carbón licuado", + "item.bucket.coal": "Cubo de carbón licuado", + "fluid.basemetals.charcoal.name": "Carbón vegetal licuado", + "item.bucket.charcoal": "Cubo de carbón vegetal licuado" +} diff --git a/src/generated/resources/assets/basemetals/lang/fr_ca.json b/src/generated/resources/assets/basemetals/lang/fr_ca.json index c826d86d..fe5e2795 100644 --- a/src/generated/resources/assets/basemetals/lang/fr_ca.json +++ b/src/generated/resources/assets/basemetals/lang/fr_ca.json @@ -6,36 +6,36 @@ "itemGroup.basemetals.tools": "Base Metals Tools", "item.basemetals.adamantine_axe": "Hache en adamantin", "item.basemetals.adamantine_bars": "Barres en adamantin", - "item.basemetals.adamantine_block": "Bloc d\u0027adamantin", + "item.basemetals.adamantine_block": "Bloc d'adamantin", "item.basemetals.adamantine_boots": "Bottes en adamantin", "item.basemetals.adamantine_chestplate": "Plastron en adamantin", "item.basemetals.adamantine_crackhammer": "Massette en adamantin", "item.basemetals.adamantine_door": "Porte en adamantin", "item.basemetals.adamantine_helmet": "Casque en adamantin", "item.basemetals.adamantine_hoe": "Houe en adamantin", - "item.basemetals.adamantine_ingot": "Lingot d\u0027adamantin", + "item.basemetals.adamantine_ingot": "Lingot d'adamantin", "item.basemetals.adamantine_leggings": "Jambières en adamantin", - "item.basemetals.adamantine_nugget": "Pépite d\u0027adamantin", - "item.basemetals.adamantine_ore": "Minerai d\u0027adamantin", + "item.basemetals.adamantine_nugget": "Pépite d'adamantin", + "item.basemetals.adamantine_ore": "Minerai d'adamantin", "item.basemetals.adamantine_pickaxe": "Pioche en adamantin", "item.basemetals.adamantine_powder": "Adamantin en poudre", "item.basemetals.adamantine_shovel": "Pelle en adamantin", "item.basemetals.adamantine_sword": "Épée en adamantin", "item.basemetals.adamantine_trapdoor": "Trappe en adamantin", "item.basemetals.aquarium_axe": "Hache en aquarium", - "item.basemetals.aquarium_bars": "Barres d\u0027aquarium", - "item.basemetals.aquarium_blend": "Mélange d\u0027aquarium", - "item.basemetals.aquarium_block": "Bloc d\u0027aquarium", + "item.basemetals.aquarium_bars": "Barres d'aquarium", + "item.basemetals.aquarium_blend": "Mélange d'aquarium", + "item.basemetals.aquarium_block": "Bloc d'aquarium", "item.basemetals.aquarium_boots": "Bottes en aquarium", "item.basemetals.aquarium_chestplate": "Plastron en aquarium", "item.basemetals.aquarium_crackhammer": "Massette en aquarium", "item.basemetals.aquarium_door": "Porte en aquarium", "item.basemetals.aquarium_helmet": "Casque en aquarium", "item.basemetals.aquarium_hoe": "Houe en aquarium", - "item.basemetals.aquarium_ingot": "Lingot d\u0027aquarium", + "item.basemetals.aquarium_ingot": "Lingot d'aquarium", "item.basemetals.aquarium_leggings": "Jambières en aquarium", - "item.basemetals.aquarium_nugget": "Pépite d\u0027aquarium", - "item.basemetals.aquarium_ore": "Minerai d\u0027aquarium", + "item.basemetals.aquarium_nugget": "Pépite d'aquarium", + "item.basemetals.aquarium_ore": "Minerai d'aquarium", "item.basemetals.aquarium_pickaxe": "Pioche en aquarium", "item.basemetals.aquarium_powder": "Aquarium en poudre", "item.basemetals.aquarium_shovel": "Pelle en aquarium", @@ -115,36 +115,36 @@ "item.basemetals.copper_sword": "Épée en cuivre", "item.basemetals.copper_trapdoor": "Trappe en cuivre", "item.basemetals.electrum_axe": "Hache en électrum", - "item.basemetals.electrum_bars": "Barres d\u0027électrum", - "item.basemetals.electrum_blend": "Mélange d\u0027électrum", - "item.basemetals.electrum_block": "Bloc d\u0027électrum", + "item.basemetals.electrum_bars": "Barres d'électrum", + "item.basemetals.electrum_blend": "Mélange d'électrum", + "item.basemetals.electrum_block": "Bloc d'électrum", "item.basemetals.electrum_boots": "Bottes en électrum", "item.basemetals.electrum_chestplate": "Plastronen électrum", "item.basemetals.electrum_crackhammer": "Massette en électrum", "item.basemetals.electrum_door": "Porte en électrum", "item.basemetals.electrum_helmet": "Casque en électrum", "item.basemetals.electrum_hoe": "Houe en électrum", - "item.basemetals.electrum_ingot": "Lingot d\u0027électrum", + "item.basemetals.electrum_ingot": "Lingot d'électrum", "item.basemetals.electrum_leggings": "jambières en électrum", - "item.basemetals.electrum_nugget": "Pépite d\u0027électrum", + "item.basemetals.electrum_nugget": "Pépite d'électrum", "item.basemetals.electrum_pickaxe": "Electrum Pickaxe", "item.basemetals.electrum_powder": "Électrum en poudre", "item.basemetals.electrum_shovel": "Pelle en électrum", "item.basemetals.electrum_sword": "Épée en électrum", "item.basemetals.electrum_trapdoor": "Trappe en électrum", "item.basemetals.invar_axe": "Hache en invar", - "item.basemetals.invar_bars": "Barres d\u0027invar", - "item.basemetals.invar_blend": "Mélange d\u0027invar", - "item.basemetals.invar_block": "Bloc d\u0027invar", + "item.basemetals.invar_bars": "Barres d'invar", + "item.basemetals.invar_blend": "Mélange d'invar", + "item.basemetals.invar_block": "Bloc d'invar", "item.basemetals.invar_boots": "Bottes en invar", "item.basemetals.invar_chestplate": "Plastron en invar", "item.basemetals.invar_crackhammer": "Massette en invar", "item.basemetals.invar_door": "Porte en invar", "item.basemetals.invar_helmet": "Casque en invar", "item.basemetals.invar_hoe": "Houe en invar", - "item.basemetals.invar_ingot": "Lingot d\u0027invar", + "item.basemetals.invar_ingot": "Lingot d'invar", "item.basemetals.invar_leggings": "Jambières en invar", - "item.basemetals.invar_nugget": "Pépite d\u0027invar", + "item.basemetals.invar_nugget": "Pépite d'invar", "item.basemetals.invar_pickaxe": "Pioche en invar", "item.basemetals.invar_powder": "Invar en poudre", "item.basemetals.invar_shovel": "Pelle en invar", @@ -213,54 +213,54 @@ "item.basemetals.nickel_sword": "Épée en nickel", "item.basemetals.nickel_trapdoor": "Trappe en nickel", "item.basemetals.silver_axe": "Hache en argent", - "item.basemetals.silver_bars": "Barres d\u0027argent", - "item.basemetals.silver_block": "Bloc d\u0027argent", + "item.basemetals.silver_bars": "Barres d'argent", + "item.basemetals.silver_block": "Bloc d'argent", "item.basemetals.silver_boots": "Bottes en argent", "item.basemetals.silver_chestplate": "Plastron en argent", "item.basemetals.silver_crackhammer": "Massette en argent", "item.basemetals.silver_door": "Porte en argent", "item.basemetals.silver_helmet": "Casque en argent", "item.basemetals.silver_hoe": "Houe en argent", - "item.basemetals.silver_ingot": "Lingot d\u0027argent", + "item.basemetals.silver_ingot": "Lingot d'argent", "item.basemetals.silver_leggings": "Jambières en argent", - "item.basemetals.silver_nugget": "Pépite d\u0027argent", - "item.basemetals.silver_ore": "Minerai d\u0027argent", + "item.basemetals.silver_nugget": "Pépite d'argent", + "item.basemetals.silver_ore": "Minerai d'argent", "item.basemetals.silver_pickaxe": "Pioche en argent", "item.basemetals.silver_powder": "Argent en poudre", "item.basemetals.silver_shovel": "Pelle en argent", "item.basemetals.silver_sword": "Épée en argent", "item.basemetals.silver_trapdoor": "Trappe en argent", "item.basemetals.starsteel_axe": "Hache en acier-étoile", - "item.basemetals.starsteel_bars": "Barres d\u0027acier-étoile", - "item.basemetals.starsteel_block": "Bloc d\u0027acier-étoile", + "item.basemetals.starsteel_bars": "Barres d'acier-étoile", + "item.basemetals.starsteel_block": "Bloc d'acier-étoile", "item.basemetals.starsteel_boots": "Bottes en acier-étoile", "item.basemetals.starsteel_chestplate": "Plastron en acier-étoile", "item.basemetals.starsteel_crackhammer": "Massette en acier-étoile", "item.basemetals.starsteel_door": "Porte en acier-étoile", "item.basemetals.starsteel_helmet": "Casque en acier-étoile", "item.basemetals.starsteel_hoe": "Houe en acier-étoile", - "item.basemetals.starsteel_ingot": "Lingot d\u0027acier-étoile", + "item.basemetals.starsteel_ingot": "Lingot d'acier-étoile", "item.basemetals.starsteel_leggings": "Jambières en acier-étoile", - "item.basemetals.starsteel_nugget": "Pépite d\u0027acier-étoile", - "item.basemetals.starsteel_ore": "Minerai d\u0027acier-étoile", + "item.basemetals.starsteel_nugget": "Pépite d'acier-étoile", + "item.basemetals.starsteel_ore": "Minerai d'acier-étoile", "item.basemetals.starsteel_pickaxe": "Pioche en acier-étoile", "item.basemetals.starsteel_powder": "Acier-étoile en poudre", "item.basemetals.starsteel_shovel": "Pelle en acier-étoile", "item.basemetals.starsteel_sword": "Épée en acier-étoile", "item.basemetals.starsteel_trapdoor": "Trappe en acier-étoile", "item.basemetals.steel_axe": "Hache en acier", - "item.basemetals.steel_bars": "Barres d\u0027acier", - "item.basemetals.steel_blend": "Mélange d\u0027acier", - "item.basemetals.steel_block": "Bloc d\u0027acier", + "item.basemetals.steel_bars": "Barres d'acier", + "item.basemetals.steel_blend": "Mélange d'acier", + "item.basemetals.steel_block": "Bloc d'acier", "item.basemetals.steel_boots": "Bottes en acier", "item.basemetals.steel_chestplate": "Plastron en acier", "item.basemetals.steel_crackhammer": "Massette en acier", "item.basemetals.steel_door": "Porte en acier", "item.basemetals.steel_helmet": "Casque en acier", "item.basemetals.steel_hoe": "Houe en acier", - "item.basemetals.steel_ingot": "Lingot d\u0027acier", + "item.basemetals.steel_ingot": "Lingot d'acier", "item.basemetals.steel_leggings": "Jambières en acier", - "item.basemetals.steel_nugget": "Pépite d\u0027acier", + "item.basemetals.steel_nugget": "Pépite d'acier", "item.basemetals.steel_pickaxe": "Pioche en acier", "item.basemetals.steel_powder": "Acier en poudre", "item.basemetals.steel_shovel": "Pelle en acier", @@ -268,18 +268,18 @@ "item.basemetals.steel_trapdoor": "Trappe en acier", "item.basemetals.stone_crackhammer": "Massette ene pierre", "item.basemetals.tin_axe": "Hache en étain", - "item.basemetals.tin_bars": "Barres d\u0027étain", - "item.basemetals.tin_block": "Bloc d\u0027étain", + "item.basemetals.tin_bars": "Barres d'étain", + "item.basemetals.tin_block": "Bloc d'étain", "item.basemetals.tin_boots": "Bottes en étain", "item.basemetals.tin_chestplate": "Plastron en étain", "item.basemetals.tin_crackhammer": "Massette en étain", "item.basemetals.tin_door": "Porte en étain", "item.basemetals.tin_helmet": "Casque en étain", "item.basemetals.tin_hoe": "Houe en étain", - "item.basemetals.tin_ingot": "Lingot d\u0027étain", + "item.basemetals.tin_ingot": "Lingot d'étain", "item.basemetals.tin_leggings": "Jambières en étain", - "item.basemetals.tin_nugget": "Pépite d\u0027étain", - "item.basemetals.tin_ore": "Minerai d\u0027étain", + "item.basemetals.tin_nugget": "Pépite d'étain", + "item.basemetals.tin_ore": "Minerai d'étain", "item.basemetals.tin_pickaxe": "Pioche en étain", "item.basemetals.tin_powder": "Étain en poudre", "item.basemetals.tin_shovel": "Pelle en étain", @@ -290,13 +290,13 @@ "item.basemetals.zinc_nugget": "Pépite de zinc", "item.basemetals.zinc_ore": "Minerai de zinc", "item.basemetals.zinc_powder": "Zinc en poudre", - "block.basemetals.adamantine_bars": "Barres d\u0027adamantin", - "block.basemetals.adamantine_block": "Bloc d\u0027adamantin", + "block.basemetals.adamantine_bars": "Barres d'adamantin", + "block.basemetals.adamantine_block": "Bloc d'adamantin", "block.basemetals.adamantine_door": "Porte en adamantin", - "block.basemetals.adamantine_ore": "Minerai d\u0027adamantin", + "block.basemetals.adamantine_ore": "Minerai d'adamantin", "block.basemetals.adamantine_trapdoor": "Trappe en adamantin", - "block.basemetals.aquarium_bars": "Barres d\u0027aquarium", - "block.basemetals.aquarium_block": "Bloc d\u0027aquarium", + "block.basemetals.aquarium_bars": "Barres d'aquarium", + "block.basemetals.aquarium_block": "Bloc d'aquarium", "block.basemetals.aquarium_door": "Porte en aquarium", "block.basemetals.aquarium_trapdoor": "Trappe en aquarium", "block.basemetals.brass_bars": "Barres de laiton", @@ -317,12 +317,12 @@ "block.basemetals.copper_door": "Porte en cuivre", "block.basemetals.copper_ore": "Minerai de cuivre", "block.basemetals.copper_trapdoor": "Trappe en cuivre", - "block.basemetals.electrum_bars": "Barres d\u0027électrum", - "block.basemetals.electrum_block": "Bloc d\u0027électrum", + "block.basemetals.electrum_bars": "Barres d'électrum", + "block.basemetals.electrum_block": "Bloc d'électrum", "block.basemetals.electrum_door": "Porte en électrum", "block.basemetals.electrum_trapdoor": "Trappe électrum", - "block.basemetals.invar_bars": "Barres d\u0027invar", - "block.basemetals.invar_block": "Bloc d\u0027invar", + "block.basemetals.invar_bars": "Barres d'invar", + "block.basemetals.invar_block": "Bloc d'invar", "block.basemetals.invar_door": "Porte en invar", "block.basemetals.invar_trapdoor": "Trappe en invar", "block.basemetals.lead_bars": "Barres de plomb", @@ -340,55 +340,55 @@ "block.basemetals.nickel_door": "Porte en nickel", "block.basemetals.nickel_ore": "Minerai de nickel", "block.basemetals.nickel_trapdoor": "Trappe en nickel", - "block.basemetals.silver_bars": "Barres d\u0027argent", - "block.basemetals.silver_block": "Bloc d\u0027argent", + "block.basemetals.silver_bars": "Barres d'argent", + "block.basemetals.silver_block": "Bloc d'argent", "block.basemetals.silver_door": "Porte en argent", - "block.basemetals.silver_ore": "Minerai d\u0027argent", + "block.basemetals.silver_ore": "Minerai d'argent", "block.basemetals.silver_trapdoor": "Trappe en argent", - "block.basemetals.starsteel_bars": "Barres d\u0027acier-étoile", - "block.basemetals.starsteel_block": "Bloc d\u0027acier-étoile", + "block.basemetals.starsteel_bars": "Barres d'acier-étoile", + "block.basemetals.starsteel_block": "Bloc d'acier-étoile", "block.basemetals.starsteel_door": "Porte en acier-étoile", - "block.basemetals.starsteel_ore": "Minerai d\u0027acier-étoile", + "block.basemetals.starsteel_ore": "Minerai d'acier-étoile", "block.basemetals.starsteel_trapdoor": "Trappe en acier-étoile", - "block.basemetals.steel_bars": "Barres d\u0027acier", - "block.basemetals.steel_block": "Bloc d\u0027acier", + "block.basemetals.steel_bars": "Barres d'acier", + "block.basemetals.steel_block": "Bloc d'acier", "block.basemetals.steel_door": "Porte en acier", "block.basemetals.steel_trapdoor": "Trappe en acier", - "block.basemetals.tin_bars": "Barres d\u0027étain", - "block.basemetals.tin_block": "Bloc d\u0027étain", + "block.basemetals.tin_bars": "Barres d'étain", + "block.basemetals.tin_block": "Bloc d'étain", "block.basemetals.tin_door": "Porte en étain", - "block.basemetals.tin_ore": "Minerai d\u0027étain", + "block.basemetals.tin_ore": "Minerai d'étain", "block.basemetals.tin_trapdoor": "Trappe en étain", "block.basemetals.zinc_block": "Bloc de zinc", "block.basemetals.zinc_ore": "Minerai de zinc", - "block.basemetals.adamantine_plate": "Plaque d\u0027adamantin", - "block.basemetals.aquarium_plate": "Plaque d\u0027aquarium", + "block.basemetals.adamantine_plate": "Plaque d'adamantin", + "block.basemetals.aquarium_plate": "Plaque d'aquarium", "block.basemetals.brass_plate": "Plaque de laiton", "block.basemetals.bronze_plate": "Plaque de bronze", "block.basemetals.coldiron_plate": "Plaque de fer-froid", "block.basemetals.copper_plate": "Plaque de cuivre", - "block.basemetals.electrum_plate": "Plaque d\u0027électrum", - "block.basemetals.invar_plate": "Plaque d\u0027invar", + "block.basemetals.electrum_plate": "Plaque d'électrum", + "block.basemetals.invar_plate": "Plaque d'invar", "block.basemetals.lead_plate": "Plaque de plomb", "block.basemetals.mithril_plate": "Plaque de mithril", "block.basemetals.nickel_plate": "Plaque de nickel", - "block.basemetals.silver_plate": "Plaque d\u0027argent", - "block.basemetals.starsteel_plate": "Plaque d\u0027acier-étoile", - "block.basemetals.steel_plate": "Plaque d\u0027acier", - "block.basemetals.tin_plate": "Plaque d\u0027étain", + "block.basemetals.silver_plate": "Plaque d'argent", + "block.basemetals.starsteel_plate": "Plaque d'acier-étoile", + "block.basemetals.steel_plate": "Plaque d'acier", + "block.basemetals.tin_plate": "Plaque d'étain", "block.basemetals.zinc_plate": "Plaque de zinc", "block.basemetals.iron_plate": "Plaque de fer", - "block.basemetals.gold_plate": "Plaque d\u0027or", - "tooltip.adamantine.tool": "+%x dégâts contre les ennemis solides", - "tooltip.aquarium.tool": "+%x dégâts contre les ennemis aquatiques", - "tooltip.coldiron.tool": "+%x dégâts contre les ennemis en feu", - "tooltip.mithril.tool": "Aveugle et dépérie les morts-vivants", - "tooltip.starsteel.tool": "Répare 1 dégât toute les %x secondes", - "tooltip.adamantine.armor": "Réduit les dégâts pris", - "tooltip.aquarium.armor": "Armure complète : respiration aquatique", - "tooltip.coldiron.armor": "Armure complète : immunité au feu", - "tooltip.mithril.armor": "Armure complète : protection contre poison \u0026 dépérir", - "tooltip.starsteel.armor": "Réduit votre poids", + "block.basemetals.gold_plate": "Plaque d'or", + "tooltip.adamantine.tool": "Coups au corps à corps : +%d dégâts contre les ennemis ayant plus de 10 cœurs de vie maximale", + "tooltip.aquarium.tool": "Coups au corps à corps : +%d dégâts contre les ennemis qui respirent sous l’eau", + "tooltip.coldiron.tool": "Coups au corps à corps : +%d dégâts contre les ennemis insensibles au feu", + "tooltip.mithril.tool": "Les coups au corps à corps aveuglent les morts-vivants et infligent Wither pendant 3 secondes", + "tooltip.starsteel.tool": "Se répare en main : 1 point de durabilité toutes les %d secondes", + "tooltip.adamantine.armor": "Deux pièces donnent Résistance I ; l’armure complète donne Résistance II", + "tooltip.aquarium.armor": "Armure complète dans l’eau : respiration aquatique, résistance et suppression de Fatigue de minage", + "tooltip.coldiron.armor": "Armure complète : Résistance au feu", + "tooltip.mithril.armor": "Armure complète : supprime les effets de potion nuisibles", + "tooltip.starsteel.armor": "Sautez plus haut avec chaque pièce ; deux pièces ou plus augmentent aussi la vitesse", "advancements.basemetals.this_is_new.title": "Ceci est nouveau...", "advancements.basemetals.blocktastic.title": "Bloctastique !", "advancements.basemetals.geologist.title": "Géologue", @@ -406,20 +406,20 @@ "advancements.basemetals.juggernaut.title": "Mastodonte", "advancements.basemetals.moon_boots.title": "Marcheur de lune", "advancements.basemetals.this_is_new.description": "Cuisez un nouveau métal du mod Base Metals", - "advancements.basemetals.blocktastic.description": "Placez un bloc de métal qui ne soit ni de fer ni d\u0027or", - "advancements.basemetals.geologist.description": "Fabriquez un marteau a partir d\u0027un bloc de métal", + "advancements.basemetals.blocktastic.description": "Placez un bloc de métal qui ne soit ni de fer ni d'or", + "advancements.basemetals.geologist.description": "Fabriquez un Crack Hammer", "advancements.basemetals.brass_maker.description": "Combinez le cuivre et le zinc en poudre pour faire du laiton", - "advancements.basemetals.bronze_maker.description": "Combinez le cuivre et l\u0027étain en poudre pour faire du bronze", - "advancements.basemetals.electrum_maker.description": "Combinez l\u0027argent et l\u0027or en poudre pour faire de l\u0027électrum", - "advancements.basemetals.steel_maker.description": "Combinez le fer et le charbon en poudre pour faire de l\u0027acier", - "advancements.basemetals.invar_maker.description": "Combinez le fer et le nickel en poudre pour faire de l\u0027invar", - "advancements.basemetals.mithril_maker.description": "Combinez l\u0027argent, le fer-froid et le mercure en poudre pour faire du mithril", - "advancements.basemetals.aquarium_maker.description": "Combinez le cuivre et le zinc en poudre avec des cristaux prismarins pour faire de l\u0027aquarium", - "advancements.basemetals.metallurgy.description": "Fabriquez n\u0027importe quel mélange d\u0027alliage", - "advancements.basemetals.demon_slayer.description": "Portez l\u0027armure complète de fer-froid et maniez l\u0027épée de fer-froid", - "advancements.basemetals.angel_of_death.description": "Portez l\u0027armure complète de mithril et maniez l\u0027épée de mithril", - "advancements.basemetals.scuba_diver.description": "Portez l\u0027armure complète d\u0027aquarium et nagez sous l\u0027eau", - "advancements.basemetals.juggernaut.description": "Portez l\u0027armure complète d\u0027adamantine", + "advancements.basemetals.bronze_maker.description": "Combinez le cuivre et l'étain en poudre pour faire du bronze", + "advancements.basemetals.electrum_maker.description": "Combinez l'argent et l'or en poudre pour faire de l'électrum", + "advancements.basemetals.steel_maker.description": "Faites fondre de l’acier à partir d’un mélange de poudres de fer et charbon", + "advancements.basemetals.invar_maker.description": "Combinez le fer et le nickel en poudre pour faire de l'invar", + "advancements.basemetals.mithril_maker.description": "Combinez l'argent, le fer-froid et le mercure en poudre pour faire du mithril", + "advancements.basemetals.aquarium_maker.description": "Faites fondre de l’Aquarium à partir d’un mélange de poudres de cuivre, zinc et prismarine", + "advancements.basemetals.metallurgy.description": "Fabriquez n'importe quel mélange d'alliage", + "advancements.basemetals.demon_slayer.description": "Portez l'armure complète de fer-froid et maniez l'épée de fer-froid", + "advancements.basemetals.angel_of_death.description": "Portez l'armure complète de mithril et maniez l'épée de mithril", + "advancements.basemetals.scuba_diver.description": "Portez l'armure complète d'aquarium et nagez sous l'eau", + "advancements.basemetals.juggernaut.description": "Portez l'armure complète d'adamantine", "advancements.basemetals.moon_boots.description": "Portez une paire de bottes en acier-étoile", "item.basemetals.diamond_crackhammer": "Massette en diamant", "item.basemetals.wood_crackhammer": "Massette en bois", @@ -430,7 +430,7 @@ "item.basemetals.cupronickel_axe": "Hache en cuivre-nickel", "item.basemetals.cupronickel_bars": "Mélange de cuivre-nickel", "item.basemetals.cupronickel_blend": "Mezcla de cuivre-nickel", - "item.basemetals.cupronickel_block": "Bloc d\u0027cuivre-nickel", + "item.basemetals.cupronickel_block": "Bloc d'cuivre-nickel", "item.basemetals.cupronickel_boots": "Bottes en cuivre-nickel", "item.basemetals.cupronickel_chestplate": "Plastron en cuivre-nickel", "item.basemetals.cupronickel_crackhammer": "Massette en cuivre-nickel", @@ -446,7 +446,7 @@ "item.basemetals.cupronickel_sword": "Épée en cuivre-nickel", "item.basemetals.cupronickel_trapdoor": "Trappe en cuivre-nickel", "block.basemetals.cupronickel_bars": "Mélange de cuivre-nickel", - "block.basemetals.cupronickel_block": "Bloc d\u0027cuivre-nickel", + "block.basemetals.cupronickel_block": "Bloc d'cuivre-nickel", "block.basemetals.cupronickel_door": "Porte en cuivre-nickel", "block.basemetals.cupronickel_trapdoor": "Trappe en cuivre-nickel", "item.basemetals.platinum_axe": "Hache en platine", @@ -760,8 +760,8 @@ "block.basemetals.steel": "Molten Steel", "block.basemetals.tin": "Molten Tin", "block.basemetals.zinc": "Molten Zinc", - "block.basemetals.charcoal": "Molten Charcoal", - "block.basemetals.coal": "Molten Coal", + "block.basemetals.charcoal": "Charbon de bois liquéfié", + "block.basemetals.coal": "Charbon liquéfié", "block.basemetals.diamond": "Molten Diamond", "block.basemetals.emerald": "Molten Emerald", "block.basemetals.ender": "Molten Ender", @@ -1567,5 +1567,30 @@ "slurry.basemetals.clean_zinc": "Clean Zinc Slurry", "advancements.basemetals.cupronickel_maker.title": "Cupronickel Maker", "advancements.basemetals.pewter_maker.title": "Pewter Maker", - "advancements.basemetals.pewter_maker.description": "Progress through Base Metals: Pewter Maker." -} \ No newline at end of file + "advancements.basemetals.pewter_maker.description": "Faites fondre du Pewter à partir d’un mélange de poudres d’étain, cuivre et plomb", + "config.basemetals.title": "Réglages de Base Metals", + "config.basemetals.contentMode": "Mode de contenu", + "config.basemetals.contentMode.tooltip": "Choisissez votre liberté de fabrication avec les métaux. La génération des minerais reste la même.", + "config.basemetals.content_mode.high_fantasy": "High Fantasy", + "config.basemetals.content_mode.low_fantasy": "Low Fantasy", + "config.basemetals.content_mode.high_fantasy.description": "Fabriquez librement avec tous les métaux. Toutes les recettes, les offres des villageois et les trouvailles dans les coffres sont disponibles.", + "config.basemetals.content_mode.low_fantasy.description": "Gardez les métaux fantastiques, mais limitez ce que chaque matériau permet de fabriquer. Pas d’arcs, d’arbalètes ni de cannes à pêche Base Metals.", + "config.basemetals.specialEffects": "Effets spéciaux de l’équipement", + "config.basemetals.specialEffects.tooltip": "Donne à certains métaux des effets d’armure et de combat, comme respirer sous l’eau avec une armure complète en Aquarium.", + "config.basemetals.starsteelRegeneration": "Autoréparation de l’acier stellaire", + "config.basemetals.starsteelRegeneration.tooltip": "L’équipement en acier stellaire se répare en main : 1 point de durabilité toutes les 10 secondes. L’armure ne se répare pas toute seule.", + "config.basemetals.mercuryImmersionEffects": "Intoxication au mercure", + "config.basemetals.mercuryImmersionEffects.tooltip": "Toucher du mercure liquide peut provoquer des nausées.", + "config.basemetals.villagerTrades": "Commerce des villageois", + "config.basemetals.villagerTrades.tooltip": "Permet aux forgerons de vendre des lingots et de l’équipement Base Metals.", + "config.basemetals.defaults": "Valeurs par défaut", + "config.basemetals.undo": "Annuler les modifications", + "config.basemetals.confirm.title": "Changer le mode de contenu ?", + "config.basemetals.confirm.message": "Redémarrez Minecraft pour utiliser le nouveau mode. Vos objets restent utilisables. Pour jouer sur un serveur, choisissez le même mode que celui-ci.", + "config.basemetals.restart": "Redémarrez Minecraft après un changement de mode. Ce choix vaut pour tous vos mondes. Utilisez OreSpawn pour régler la génération des minerais.", + "config.basemetals.connection.mismatch": "Ce serveur utilise %s, mais votre jeu utilise %s. Choisissez le même mode dans Mods → Base Metals → Config, puis redémarrez Minecraft.", + "fluid.basemetals.coal.name": "Charbon liquéfié", + "item.bucket.coal": "Seau de charbon liquéfié", + "fluid.basemetals.charcoal.name": "Charbon de bois liquéfié", + "item.bucket.charcoal": "Seau de charbon de bois liquéfié" +} diff --git a/src/generated/resources/assets/basemetals/lang/fr_fr.json b/src/generated/resources/assets/basemetals/lang/fr_fr.json index c84b6fc0..572fbca1 100644 --- a/src/generated/resources/assets/basemetals/lang/fr_fr.json +++ b/src/generated/resources/assets/basemetals/lang/fr_fr.json @@ -6,36 +6,36 @@ "itemGroup.basemetals.tools": "Base Metals Tools", "item.basemetals.adamantine_axe": "Hache en adamantin", "item.basemetals.adamantine_bars": "Barres en adamantin", - "item.basemetals.adamantine_block": "Bloc d\u0027adamantin", + "item.basemetals.adamantine_block": "Bloc d'adamantin", "item.basemetals.adamantine_boots": "Bottes en adamantin", "item.basemetals.adamantine_chestplate": "Plastron en adamantin", "item.basemetals.adamantine_crackhammer": "Massette en adamantin", "item.basemetals.adamantine_door": "Porte en adamantin", "item.basemetals.adamantine_helmet": "Casque en adamantin", "item.basemetals.adamantine_hoe": "Houe en adamantin", - "item.basemetals.adamantine_ingot": "Lingot d\u0027adamantin", + "item.basemetals.adamantine_ingot": "Lingot d'adamantin", "item.basemetals.adamantine_leggings": "Jambières en adamantin", - "item.basemetals.adamantine_nugget": "Pépite d\u0027adamantin", - "item.basemetals.adamantine_ore": "Minerai d\u0027adamantin", + "item.basemetals.adamantine_nugget": "Pépite d'adamantin", + "item.basemetals.adamantine_ore": "Minerai d'adamantin", "item.basemetals.adamantine_pickaxe": "Pioche en adamantin", "item.basemetals.adamantine_powder": "Adamantin en poudre", "item.basemetals.adamantine_shovel": "Pelle en adamantin", "item.basemetals.adamantine_sword": "Épée en adamantin", "item.basemetals.adamantine_trapdoor": "Trappe en adamantin", "item.basemetals.aquarium_axe": "Hache en aquarium", - "item.basemetals.aquarium_bars": "Barres d\u0027aquarium", - "item.basemetals.aquarium_blend": "Mélange d\u0027aquarium", - "item.basemetals.aquarium_block": "Bloc d\u0027aquarium", + "item.basemetals.aquarium_bars": "Barres d'aquarium", + "item.basemetals.aquarium_blend": "Mélange d'aquarium", + "item.basemetals.aquarium_block": "Bloc d'aquarium", "item.basemetals.aquarium_boots": "Bottes en aquarium", "item.basemetals.aquarium_chestplate": "Plastron en aquarium", "item.basemetals.aquarium_crackhammer": "Massette en aquarium", "item.basemetals.aquarium_door": "Porte en aquarium", "item.basemetals.aquarium_helmet": "Casque en aquarium", "item.basemetals.aquarium_hoe": "Houe en aquarium", - "item.basemetals.aquarium_ingot": "Lingot d\u0027aquarium", + "item.basemetals.aquarium_ingot": "Lingot d'aquarium", "item.basemetals.aquarium_leggings": "Jambières en aquarium", - "item.basemetals.aquarium_nugget": "Pépite d\u0027aquarium", - "item.basemetals.aquarium_ore": "Minerai d\u0027aquarium", + "item.basemetals.aquarium_nugget": "Pépite d'aquarium", + "item.basemetals.aquarium_ore": "Minerai d'aquarium", "item.basemetals.aquarium_pickaxe": "Pioche en aquarium", "item.basemetals.aquarium_powder": "Aquarium en poudre", "item.basemetals.aquarium_shovel": "Pelle en aquarium", @@ -115,36 +115,36 @@ "item.basemetals.copper_sword": "Épée en cuivre", "item.basemetals.copper_trapdoor": "Trappe en cuivre", "item.basemetals.electrum_axe": "Hache en électrum", - "item.basemetals.electrum_bars": "Barres d\u0027électrum", - "item.basemetals.electrum_blend": "Mélange d\u0027électrum", - "item.basemetals.electrum_block": "Bloc d\u0027électrum", + "item.basemetals.electrum_bars": "Barres d'électrum", + "item.basemetals.electrum_blend": "Mélange d'électrum", + "item.basemetals.electrum_block": "Bloc d'électrum", "item.basemetals.electrum_boots": "Bottes en électrum", "item.basemetals.electrum_chestplate": "Plastronen électrum", "item.basemetals.electrum_crackhammer": "Massette en électrum", "item.basemetals.electrum_door": "Porte en électrum", "item.basemetals.electrum_helmet": "Casque en électrum", "item.basemetals.electrum_hoe": "Houe en électrum", - "item.basemetals.electrum_ingot": "Lingot d\u0027électrum", + "item.basemetals.electrum_ingot": "Lingot d'électrum", "item.basemetals.electrum_leggings": "jambières en électrum", - "item.basemetals.electrum_nugget": "Pépite d\u0027électrum", + "item.basemetals.electrum_nugget": "Pépite d'électrum", "item.basemetals.electrum_pickaxe": "Electrum Pickaxe", "item.basemetals.electrum_powder": "Électrum en poudre", "item.basemetals.electrum_shovel": "Pelle en électrum", "item.basemetals.electrum_sword": "Épée en électrum", "item.basemetals.electrum_trapdoor": "Trappe en électrum", "item.basemetals.invar_axe": "Hache en invar", - "item.basemetals.invar_bars": "Barres d\u0027invar", - "item.basemetals.invar_blend": "Mélange d\u0027invar", - "item.basemetals.invar_block": "Bloc d\u0027invar", + "item.basemetals.invar_bars": "Barres d'invar", + "item.basemetals.invar_blend": "Mélange d'invar", + "item.basemetals.invar_block": "Bloc d'invar", "item.basemetals.invar_boots": "Bottes en invar", "item.basemetals.invar_chestplate": "Plastron en invar", "item.basemetals.invar_crackhammer": "Massette en invar", "item.basemetals.invar_door": "Porte en invar", "item.basemetals.invar_helmet": "Casque en invar", "item.basemetals.invar_hoe": "Houe en invar", - "item.basemetals.invar_ingot": "Lingot d\u0027invar", + "item.basemetals.invar_ingot": "Lingot d'invar", "item.basemetals.invar_leggings": "Jambières en invar", - "item.basemetals.invar_nugget": "Pépite d\u0027invar", + "item.basemetals.invar_nugget": "Pépite d'invar", "item.basemetals.invar_pickaxe": "Pioche en invar", "item.basemetals.invar_powder": "Invar en poudre", "item.basemetals.invar_shovel": "Pelle en invar", @@ -212,54 +212,54 @@ "item.basemetals.nickel_sword": "Épée en nickel", "item.basemetals.nickel_trapdoor": "Trappe en nickel", "item.basemetals.silver_axe": "Hache en argent", - "item.basemetals.silver_bars": "Barres d\u0027argent", - "item.basemetals.silver_block": "Bloc d\u0027argent", + "item.basemetals.silver_bars": "Barres d'argent", + "item.basemetals.silver_block": "Bloc d'argent", "item.basemetals.silver_boots": "Bottes en argent", "item.basemetals.silver_chestplate": "Plastron en argent", "item.basemetals.silver_crackhammer": "Massette en argent", "item.basemetals.silver_door": "Porte en argent", "item.basemetals.silver_helmet": "Casque en argent", "item.basemetals.silver_hoe": "Houe en argent", - "item.basemetals.silver_ingot": "Lingot d\u0027argent", + "item.basemetals.silver_ingot": "Lingot d'argent", "item.basemetals.silver_leggings": "Jambières en argent", - "item.basemetals.silver_nugget": "Pépite d\u0027argent", - "item.basemetals.silver_ore": "Minerai d\u0027argent", + "item.basemetals.silver_nugget": "Pépite d'argent", + "item.basemetals.silver_ore": "Minerai d'argent", "item.basemetals.silver_pickaxe": "Pioche en argent", "item.basemetals.silver_powder": "Argent en poudre", "item.basemetals.silver_shovel": "Pelle en argent", "item.basemetals.silver_sword": "Épée en argent", "item.basemetals.silver_trapdoor": "Trappe en argent", "item.basemetals.starsteel_axe": "Hache en acier-étoile", - "item.basemetals.starsteel_bars": "Barres d\u0027acier-étoile", - "item.basemetals.starsteel_block": "Bloc d\u0027acier-étoile", + "item.basemetals.starsteel_bars": "Barres d'acier-étoile", + "item.basemetals.starsteel_block": "Bloc d'acier-étoile", "item.basemetals.starsteel_boots": "Bottes en acier-étoile", "item.basemetals.starsteel_chestplate": "Plastron en acier-étoile", "item.basemetals.starsteel_crackhammer": "Massette en acier-étoile", "item.basemetals.starsteel_door": "Porte en acier-étoile", "item.basemetals.starsteel_helmet": "Casque en acier-étoile", "item.basemetals.starsteel_hoe": "Houe en acier-étoile", - "item.basemetals.starsteel_ingot": "Lingot d\u0027acier-étoile", + "item.basemetals.starsteel_ingot": "Lingot d'acier-étoile", "item.basemetals.starsteel_leggings": "Jambières en acier-étoile", - "item.basemetals.starsteel_nugget": "Pépite d\u0027acier-étoile", - "item.basemetals.starsteel_ore": "Minerai d\u0027acier-étoile", + "item.basemetals.starsteel_nugget": "Pépite d'acier-étoile", + "item.basemetals.starsteel_ore": "Minerai d'acier-étoile", "item.basemetals.starsteel_pickaxe": "Pioche en acier-étoile", "item.basemetals.starsteel_powder": "Acier-étoile en poudre", "item.basemetals.starsteel_shovel": "Pelle en acier-étoile", "item.basemetals.starsteel_sword": "Épée en acier-étoile", "item.basemetals.starsteel_trapdoor": "Trappe en acier-étoile", "item.basemetals.steel_axe": "Hache en acier", - "item.basemetals.steel_bars": "Barres d\u0027acier", - "item.basemetals.steel_blend": "Mélange d\u0027acier", - "item.basemetals.steel_block": "Bloc d\u0027acier", + "item.basemetals.steel_bars": "Barres d'acier", + "item.basemetals.steel_blend": "Mélange d'acier", + "item.basemetals.steel_block": "Bloc d'acier", "item.basemetals.steel_boots": "Bottes en acier", "item.basemetals.steel_chestplate": "Plastron en acier", "item.basemetals.steel_crackhammer": "Massette en acier", "item.basemetals.steel_door": "Porte en acier", "item.basemetals.steel_helmet": "Casque en acier", "item.basemetals.steel_hoe": "Houe en acier", - "item.basemetals.steel_ingot": "Lingot d\u0027acier", + "item.basemetals.steel_ingot": "Lingot d'acier", "item.basemetals.steel_leggings": "Jambières en acier", - "item.basemetals.steel_nugget": "Pépite d\u0027acier", + "item.basemetals.steel_nugget": "Pépite d'acier", "item.basemetals.steel_pickaxe": "Pioche en acier", "item.basemetals.steel_powder": "Acier en poudre", "item.basemetals.steel_shovel": "Pelle en acier", @@ -267,18 +267,18 @@ "item.basemetals.steel_trapdoor": "Trappe en acier", "item.basemetals.stone_crackhammer": "Massette ene pierre", "item.basemetals.tin_axe": "Hache en étain", - "item.basemetals.tin_bars": "Barres d\u0027étain", - "item.basemetals.tin_block": "Bloc d\u0027étain", + "item.basemetals.tin_bars": "Barres d'étain", + "item.basemetals.tin_block": "Bloc d'étain", "item.basemetals.tin_boots": "Bottes en étain", "item.basemetals.tin_chestplate": "Plastron en étain", "item.basemetals.tin_crackhammer": "Massette en étain", "item.basemetals.tin_door": "Porte en étain", "item.basemetals.tin_helmet": "Casque en étain", "item.basemetals.tin_hoe": "Houe en étain", - "item.basemetals.tin_ingot": "Lingot d\u0027étain", + "item.basemetals.tin_ingot": "Lingot d'étain", "item.basemetals.tin_leggings": "Jambières en étain", - "item.basemetals.tin_nugget": "Pépite d\u0027étain", - "item.basemetals.tin_ore": "Minerai d\u0027étain", + "item.basemetals.tin_nugget": "Pépite d'étain", + "item.basemetals.tin_ore": "Minerai d'étain", "item.basemetals.tin_pickaxe": "Pioche en étain", "item.basemetals.tin_powder": "Étain en poudre", "item.basemetals.tin_shovel": "Pelle en étain", @@ -289,13 +289,13 @@ "item.basemetals.zinc_nugget": "Pépite de zinc", "item.basemetals.zinc_ore": "Minerai de zinc", "item.basemetals.zinc_powder": "Zinc en poudre", - "block.basemetals.adamantine_bars": "Barres d\u0027adamantin", - "block.basemetals.adamantine_block": "Bloc d\u0027adamantin", + "block.basemetals.adamantine_bars": "Barres d'adamantin", + "block.basemetals.adamantine_block": "Bloc d'adamantin", "block.basemetals.adamantine_door": "Porte en adamantin", - "block.basemetals.adamantine_ore": "Minerai d\u0027adamantin", + "block.basemetals.adamantine_ore": "Minerai d'adamantin", "block.basemetals.adamantine_trapdoor": "Trappe en adamantin", - "block.basemetals.aquarium_bars": "Barres d\u0027aquarium", - "block.basemetals.aquarium_block": "Bloc d\u0027aquarium", + "block.basemetals.aquarium_bars": "Barres d'aquarium", + "block.basemetals.aquarium_block": "Bloc d'aquarium", "block.basemetals.aquarium_door": "Porte en aquarium", "block.basemetals.aquarium_trapdoor": "Trappe en aquarium", "block.basemetals.brass_bars": "Barres de laiton", @@ -316,12 +316,12 @@ "block.basemetals.copper_door": "Porte en cuivre", "block.basemetals.copper_ore": "Minerai de cuivre", "block.basemetals.copper_trapdoor": "Trappe en cuivre", - "block.basemetals.electrum_bars": "Barres d\u0027électrum", - "block.basemetals.electrum_block": "Bloc d\u0027électrum", + "block.basemetals.electrum_bars": "Barres d'électrum", + "block.basemetals.electrum_block": "Bloc d'électrum", "block.basemetals.electrum_door": "Porte en électrum", "block.basemetals.electrum_trapdoor": "Trappe électrum", - "block.basemetals.invar_bars": "Barres d\u0027invar", - "block.basemetals.invar_block": "Bloc d\u0027invar", + "block.basemetals.invar_bars": "Barres d'invar", + "block.basemetals.invar_block": "Bloc d'invar", "block.basemetals.invar_door": "Porte en invar", "block.basemetals.invar_trapdoor": "Trappe en invar", "block.basemetals.lead_bars": "Barres de plomb", @@ -339,55 +339,55 @@ "block.basemetals.nickel_door": "Porte en nickel", "block.basemetals.nickel_ore": "Minerai de nickel", "block.basemetals.nickel_trapdoor": "Trappe en nickel", - "block.basemetals.silver_bars": "Barres d\u0027argent", - "block.basemetals.silver_block": "Bloc d\u0027argent", + "block.basemetals.silver_bars": "Barres d'argent", + "block.basemetals.silver_block": "Bloc d'argent", "block.basemetals.silver_door": "Porte en argent", - "block.basemetals.silver_ore": "Minerai d\u0027argent", + "block.basemetals.silver_ore": "Minerai d'argent", "block.basemetals.silver_trapdoor": "Trappe en argent", - "block.basemetals.starsteel_bars": "Barres d\u0027acier-étoile", - "block.basemetals.starsteel_block": "Bloc d\u0027acier-étoile", + "block.basemetals.starsteel_bars": "Barres d'acier-étoile", + "block.basemetals.starsteel_block": "Bloc d'acier-étoile", "block.basemetals.starsteel_door": "Porte en acier-étoile", - "block.basemetals.starsteel_ore": "Minerai d\u0027acier-étoile", + "block.basemetals.starsteel_ore": "Minerai d'acier-étoile", "block.basemetals.starsteel_trapdoor": "Trappe en acier-étoile", - "block.basemetals.steel_bars": "Barres d\u0027acier", - "block.basemetals.steel_block": "Bloc d\u0027acier", + "block.basemetals.steel_bars": "Barres d'acier", + "block.basemetals.steel_block": "Bloc d'acier", "block.basemetals.steel_door": "Porte en acier", "block.basemetals.steel_trapdoor": "Trappe en acier", - "block.basemetals.tin_bars": "Barres d\u0027étain", - "block.basemetals.tin_block": "Bloc d\u0027étain", + "block.basemetals.tin_bars": "Barres d'étain", + "block.basemetals.tin_block": "Bloc d'étain", "block.basemetals.tin_door": "Porte en étain", - "block.basemetals.tin_ore": "Minerai d\u0027étain", + "block.basemetals.tin_ore": "Minerai d'étain", "block.basemetals.tin_trapdoor": "Trappe en étain", "block.basemetals.zinc_block": "Bloc de zinc", "block.basemetals.zinc_ore": "Minerai de zinc", - "block.basemetals.adamantine_plate": "Plaque d\u0027adamantin", - "block.basemetals.aquarium_plate": "Plaque d\u0027aquarium", + "block.basemetals.adamantine_plate": "Plaque d'adamantin", + "block.basemetals.aquarium_plate": "Plaque d'aquarium", "block.basemetals.brass_plate": "Plaque de laiton", "block.basemetals.bronze_plate": "Plaque de bronze", "block.basemetals.coldiron_plate": "Plaque de fer-froid", "block.basemetals.copper_plate": "Plaque de cuivre", - "block.basemetals.electrum_plate": "Plaque d\u0027électrum", - "block.basemetals.invar_plate": "Plaque d\u0027invar", + "block.basemetals.electrum_plate": "Plaque d'électrum", + "block.basemetals.invar_plate": "Plaque d'invar", "block.basemetals.lead_plate": "Plaque de plomb", "block.basemetals.mithril_plate": "Plaque de mithril", "block.basemetals.nickel_plate": "Plaque de nickel", - "block.basemetals.silver_plate": "Plaque d\u0027argent", - "block.basemetals.starsteel_plate": "Plaque d\u0027acier-étoile", - "block.basemetals.steel_plate": "Plaque d\u0027acier", - "block.basemetals.tin_plate": "Plaque d\u0027étain", + "block.basemetals.silver_plate": "Plaque d'argent", + "block.basemetals.starsteel_plate": "Plaque d'acier-étoile", + "block.basemetals.steel_plate": "Plaque d'acier", + "block.basemetals.tin_plate": "Plaque d'étain", "block.basemetals.zinc_plate": "Plaque de zinc", "block.basemetals.iron_plate": "Plaque de fer", - "block.basemetals.gold_plate": "Plaque d\u0027or", - "tooltip.adamantine.tool": "+%x dégâts contre les ennemis solides", - "tooltip.aquarium.tool": "+%x dégâts contre les ennemis aquatiques", - "tooltip.coldiron.tool": "+%x dégâts contre les ennemis en feu", - "tooltip.mithril.tool": "Aveugle et dépérie les morts-vivants", - "tooltip.starsteel.tool": "Répare 1 dégât toute les %x secondes", - "tooltip.adamantine.armor": "Réduit les dégâts pris", - "tooltip.aquarium.armor": "Armure complète : respiration aquatique", - "tooltip.coldiron.armor": "Armure complète : immunité au feu", - "tooltip.mithril.armor": "Armure complète : protection contre poison \u0026 dépérir", - "tooltip.starsteel.armor": "Réduit votre poids", + "block.basemetals.gold_plate": "Plaque d'or", + "tooltip.adamantine.tool": "Coups au corps à corps : +%d dégâts contre les ennemis ayant plus de 10 cœurs de vie maximale", + "tooltip.aquarium.tool": "Coups au corps à corps : +%d dégâts contre les ennemis qui respirent sous l’eau", + "tooltip.coldiron.tool": "Coups au corps à corps : +%d dégâts contre les ennemis insensibles au feu", + "tooltip.mithril.tool": "Les coups au corps à corps aveuglent les morts-vivants et infligent Wither pendant 3 secondes", + "tooltip.starsteel.tool": "Se répare en main : 1 point de durabilité toutes les %d secondes", + "tooltip.adamantine.armor": "Deux pièces donnent Résistance I ; l’armure complète donne Résistance II", + "tooltip.aquarium.armor": "Armure complète dans l’eau : respiration aquatique, résistance et suppression de Fatigue de minage", + "tooltip.coldiron.armor": "Armure complète : Résistance au feu", + "tooltip.mithril.armor": "Armure complète : supprime les effets de potion nuisibles", + "tooltip.starsteel.armor": "Sautez plus haut avec chaque pièce ; deux pièces ou plus augmentent aussi la vitesse", "advancements.basemetals.this_is_new.title": "Ceci est nouveau...", "advancements.basemetals.blocktastic.title": "Bloctastique !", "advancements.basemetals.geologist.title": "Géologue", @@ -405,20 +405,20 @@ "advancements.basemetals.juggernaut.title": "Mastodonte", "advancements.basemetals.moon_boots.title": "Marcheur de lune", "advancements.basemetals.this_is_new.description": "Cuisez un nouveau métal du mod Base Metals", - "advancements.basemetals.blocktastic.description": "Placez un bloc de métal qui ne soit ni de fer ni d\u0027or", - "advancements.basemetals.geologist.description": "Fabriquez un marteau a partir d\u0027un bloc de métal", + "advancements.basemetals.blocktastic.description": "Placez un bloc de métal qui ne soit ni de fer ni d'or", + "advancements.basemetals.geologist.description": "Fabriquez un Crack Hammer", "advancements.basemetals.brass_maker.description": "Combinez le cuivre et le zinc en poudre pour faire du laiton", - "advancements.basemetals.bronze_maker.description": "Combinez le cuivre et l\u0027étain en poudre pour faire du bronze", - "advancements.basemetals.electrum_maker.description": "Combinez l\u0027argent et l\u0027or en poudre pour faire de l\u0027électrum", - "advancements.basemetals.steel_maker.description": "Combinez le fer et le charbon en poudre pour faire de l\u0027acier", - "advancements.basemetals.invar_maker.description": "Combinez le fer et le nickel en poudre pour faire de l\u0027invar", - "advancements.basemetals.mithril_maker.description": "Combinez l\u0027argent, le fer-froid et le mercure en poudre pour faire du mithril", - "advancements.basemetals.aquarium_maker.description": "Combinez le cuivre et le zinc en poudre avec des cristaux prismarins pour faire de l\u0027aquarium", - "advancements.basemetals.metallurgy.description": "Fabriquez n\u0027importe quel mélange d\u0027alliage", - "advancements.basemetals.demon_slayer.description": "Portez l\u0027armure complète de fer-froid et maniez l\u0027épée de fer-froid", - "advancements.basemetals.angel_of_death.description": "Portez l\u0027armure complète de mithril et maniez l\u0027épée de mithril", - "advancements.basemetals.scuba_diver.description": "Portez l\u0027armure complète d\u0027aquarium et nagez sous l\u0027eau", - "advancements.basemetals.juggernaut.description": "Portez l\u0027armure complète d\u0027adamantine", + "advancements.basemetals.bronze_maker.description": "Combinez le cuivre et l'étain en poudre pour faire du bronze", + "advancements.basemetals.electrum_maker.description": "Combinez l'argent et l'or en poudre pour faire de l'électrum", + "advancements.basemetals.steel_maker.description": "Faites fondre de l’acier à partir d’un mélange de poudres de fer et charbon", + "advancements.basemetals.invar_maker.description": "Combinez le fer et le nickel en poudre pour faire de l'invar", + "advancements.basemetals.mithril_maker.description": "Combinez l'argent, le fer-froid et le mercure en poudre pour faire du mithril", + "advancements.basemetals.aquarium_maker.description": "Faites fondre de l’Aquarium à partir d’un mélange de poudres de cuivre, zinc et prismarine", + "advancements.basemetals.metallurgy.description": "Fabriquez n'importe quel mélange d'alliage", + "advancements.basemetals.demon_slayer.description": "Portez l'armure complète de fer-froid et maniez l'épée de fer-froid", + "advancements.basemetals.angel_of_death.description": "Portez l'armure complète de mithril et maniez l'épée de mithril", + "advancements.basemetals.scuba_diver.description": "Portez l'armure complète d'aquarium et nagez sous l'eau", + "advancements.basemetals.juggernaut.description": "Portez l'armure complète d'adamantine", "advancements.basemetals.moon_boots.description": "Portez une paire de bottes en acier-étoile", "item.basemetals.diamond_crackhammer": "Massette en diamant", "item.basemetals.wood_crackhammer": "Massette en bois", @@ -429,7 +429,7 @@ "item.basemetals.cupronickel_axe": "Hache en cuivre-nickel", "item.basemetals.cupronickel_bars": "Mélange de cuivre-nickel", "item.basemetals.cupronickel_blend": "Mezcla de cuivre-nickel", - "item.basemetals.cupronickel_block": "Bloc d\u0027cuivre-nickel", + "item.basemetals.cupronickel_block": "Bloc d'cuivre-nickel", "item.basemetals.cupronickel_boots": "Bottes en cuivre-nickel", "item.basemetals.cupronickel_chestplate": "Plastron en cuivre-nickel", "item.basemetals.cupronickel_crackhammer": "Massette en cuivre-nickel", @@ -445,7 +445,7 @@ "item.basemetals.cupronickel_sword": "Épée en cuivre-nickel", "item.basemetals.cupronickel_trapdoor": "Trappe en cuivre-nickel", "block.basemetals.cupronickel_bars": "Mélange de cuivre-nickel", - "block.basemetals.cupronickel_block": "Bloc d\u0027cuivre-nickel", + "block.basemetals.cupronickel_block": "Bloc d'cuivre-nickel", "block.basemetals.cupronickel_door": "Porte en cuivre-nickel", "block.basemetals.cupronickel_trapdoor": "Trappe en cuivre-nickel", "item.basemetals.platinum_axe": "Hache en platine", @@ -760,8 +760,8 @@ "block.basemetals.steel": "Molten Steel", "block.basemetals.tin": "Molten Tin", "block.basemetals.zinc": "Molten Zinc", - "block.basemetals.charcoal": "Molten Charcoal", - "block.basemetals.coal": "Molten Coal", + "block.basemetals.charcoal": "Charbon de bois liquéfié", + "block.basemetals.coal": "Charbon liquéfié", "block.basemetals.diamond": "Molten Diamond", "block.basemetals.emerald": "Molten Emerald", "block.basemetals.ender": "Molten Ender", @@ -1567,5 +1567,30 @@ "slurry.basemetals.clean_zinc": "Clean Zinc Slurry", "advancements.basemetals.cupronickel_maker.title": "Cupronickel Maker", "advancements.basemetals.pewter_maker.title": "Pewter Maker", - "advancements.basemetals.pewter_maker.description": "Progress through Base Metals: Pewter Maker." -} \ No newline at end of file + "advancements.basemetals.pewter_maker.description": "Faites fondre du Pewter à partir d’un mélange de poudres d’étain, cuivre et plomb", + "config.basemetals.title": "Réglages de Base Metals", + "config.basemetals.contentMode": "Mode de contenu", + "config.basemetals.contentMode.tooltip": "Choisissez votre liberté de fabrication avec les métaux. La génération des minerais reste la même.", + "config.basemetals.content_mode.high_fantasy": "High Fantasy", + "config.basemetals.content_mode.low_fantasy": "Low Fantasy", + "config.basemetals.content_mode.high_fantasy.description": "Fabriquez librement avec tous les métaux. Toutes les recettes, les offres des villageois et les trouvailles dans les coffres sont disponibles.", + "config.basemetals.content_mode.low_fantasy.description": "Gardez les métaux fantastiques, mais limitez ce que chaque matériau permet de fabriquer. Pas d’arcs, d’arbalètes ni de cannes à pêche Base Metals.", + "config.basemetals.specialEffects": "Effets spéciaux de l’équipement", + "config.basemetals.specialEffects.tooltip": "Donne à certains métaux des effets d’armure et de combat, comme respirer sous l’eau avec une armure complète en Aquarium.", + "config.basemetals.starsteelRegeneration": "Autoréparation de l’acier stellaire", + "config.basemetals.starsteelRegeneration.tooltip": "L’équipement en acier stellaire se répare en main : 1 point de durabilité toutes les 10 secondes. L’armure ne se répare pas toute seule.", + "config.basemetals.mercuryImmersionEffects": "Intoxication au mercure", + "config.basemetals.mercuryImmersionEffects.tooltip": "Toucher du mercure liquide peut provoquer des nausées.", + "config.basemetals.villagerTrades": "Commerce des villageois", + "config.basemetals.villagerTrades.tooltip": "Permet aux forgerons de vendre des lingots et de l’équipement Base Metals.", + "config.basemetals.defaults": "Valeurs par défaut", + "config.basemetals.undo": "Annuler les modifications", + "config.basemetals.confirm.title": "Changer le mode de contenu ?", + "config.basemetals.confirm.message": "Redémarrez Minecraft pour utiliser le nouveau mode. Vos objets restent utilisables. Pour jouer sur un serveur, choisissez le même mode que celui-ci.", + "config.basemetals.restart": "Redémarrez Minecraft après un changement de mode. Ce choix vaut pour tous vos mondes. Utilisez OreSpawn pour régler la génération des minerais.", + "config.basemetals.connection.mismatch": "Ce serveur utilise %s, mais votre jeu utilise %s. Choisissez le même mode dans Mods → Base Metals → Config, puis redémarrez Minecraft.", + "fluid.basemetals.coal.name": "Charbon liquéfié", + "item.bucket.coal": "Seau de charbon liquéfié", + "fluid.basemetals.charcoal.name": "Charbon de bois liquéfié", + "item.bucket.charcoal": "Seau de charbon de bois liquéfié" +} diff --git a/src/generated/resources/assets/basemetals/lang/it_it.json b/src/generated/resources/assets/basemetals/lang/it_it.json index b3f90454..a4b0d5f0 100644 --- a/src/generated/resources/assets/basemetals/lang/it_it.json +++ b/src/generated/resources/assets/basemetals/lang/it_it.json @@ -364,7 +364,7 @@ "block.basemetals.aquarium_trapdoor": "Fuori Porta Pesce-Acciaio", "block.basemetals.adamantine_plate": "Lastra di Adamantio", "block.basemetals.aquarium_plate": "Lastra di Pesce-Acciaio", - "block.basemetals.brass_plate": "Lastra d\u0027Ottone", + "block.basemetals.brass_plate": "Lastra d'Ottone", "block.basemetals.bronze_plate": "Lastra di Bronzo", "block.basemetals.coldiron_plate": "Lastra di Ferro-Freddo", "block.basemetals.copper_plate": "Lastra di Rame", @@ -379,17 +379,17 @@ "block.basemetals.tin_plate": "Lastra di Latta", "block.basemetals.zinc_plate": "Lastra di Zinco", "block.basemetals.iron_plate": "Lastra di Ferro", - "block.basemetals.gold_plate": "Lastra d\u0027Oro", - "tooltip.adamantine.tool": "+%x danni ai nemici potenti", - "tooltip.aquarium.tool": "+%x danni ai nemici d\u0027acqua", - "tooltip.coldiron.tool": "+%x danno ai demoni", - "tooltip.mithril.tool": "Veleni morti", - "tooltip.starsteel.tool": "Riparazione automatica", - "tooltip.adamantine.armor": "Riduce i danni presi", - "tooltip.aquarium.armor": "Respirare sott\u0027acqua", - "tooltip.coldiron.armor": "Immunità al fuoco", - "tooltip.mithril.armor": "Protezione da veleno \u0026 appassire", - "tooltip.starsteel.armor": "Meno gravità", + "block.basemetals.gold_plate": "Lastra d'Oro", + "tooltip.adamantine.tool": "Colpi corpo a corpo: +%d danni ai nemici con più di 10 cuori di salute massima", + "tooltip.aquarium.tool": "Colpi corpo a corpo: +%d danni ai nemici che respirano sott’acqua", + "tooltip.coldiron.tool": "Colpi corpo a corpo: +%d danni ai nemici immuni al fuoco", + "tooltip.mithril.tool": "I colpi corpo a corpo accecano i non morti e infliggono Wither per 3 secondi", + "tooltip.starsteel.tool": "Si ripara mentre lo impugni: 1 punto di durabilità ogni %d secondi", + "tooltip.adamantine.armor": "Due pezzi danno Resistenza I; l’armatura completa dà Resistenza II", + "tooltip.aquarium.armor": "Armatura completa in acqua: respirazione acquatica, resistenza e rimuove la fatica da scavo", + "tooltip.coldiron.armor": "Armatura completa: Resistenza al fuoco", + "tooltip.mithril.armor": "Armatura completa: rimuove gli effetti dannosi delle pozioni", + "tooltip.starsteel.armor": "Salta più in alto con ogni pezzo; due o più aumentano anche la velocità", "advancements.basemetals.this_is_new.title": "Questa è una novità ...", "advancements.basemetals.blocktastic.title": "Cubo!", "advancements.basemetals.geologist.title": "Geologo", @@ -408,18 +408,18 @@ "advancements.basemetals.moon_boots.title": "Luna Walker", "advancements.basemetals.this_is_new.description": "puzzava un nuovo metallo dai metalli di base mod", "advancements.basemetals.blocktastic.description": "Inserite un blocco di metallo che non è né il ferro, né oro", - "advancements.basemetals.geologist.description": "Fare un martello da un blocco di metallo", + "advancements.basemetals.geologist.description": "Crea un Crack Hammer", "advancements.basemetals.brass_maker.description": "Combina il rame e zinco in polvere per fare in ottone", "advancements.basemetals.bronze_maker.description": "Combina il rame in polvere e stagno per fare il bronzo", - "advancements.basemetals.electrum_maker.description": "Combina l\u0027argento in polvere e oro per fare electrum", - "advancements.basemetals.steel_maker.description": "Combina polvere di ferro e carbone per produrre l\u0027acciaio", + "advancements.basemetals.electrum_maker.description": "Combina l'argento in polvere e oro per fare electrum", + "advancements.basemetals.steel_maker.description": "Fondi acciaio da una miscela di polveri di ferro e carbone", "advancements.basemetals.invar_maker.description": "Combine polvere di ferro e nichel per fare invar", "advancements.basemetals.mithril_maker.description": "Combine argento in polvere, freddo-ferro e mercurio per fare Mithril", - "advancements.basemetals.aquarium_maker.description": "Combine di rame e zinco in polvere con cristalli prismarine per rendere acquario", + "advancements.basemetals.aquarium_maker.description": "Fondi Aquarium da una miscela di polveri di rame, zinco e prismarino", "advancements.basemetals.metallurgy.description": "Craft qualsiasi miscela lega", "advancements.basemetals.demon_slayer.description": "Indossare un abito pieno di armatura freddo-ferro e brandire una spada a freddo-ferro", "advancements.basemetals.angel_of_death.description": "Indossare un abito pieno di mithril armatura e brandire una spada mithril", - "advancements.basemetals.scuba_diver.description": "Indossare un abito pieno di armatura acquario e nuotare sotto l\u0027acqua", + "advancements.basemetals.scuba_diver.description": "Indossare un abito pieno di armatura acquario e nuotare sotto l'acqua", "advancements.basemetals.juggernaut.description": "Indossare un abito pieno di armatura adamantina", "advancements.basemetals.moon_boots.description": "Indossare un paio di stivali star-acciaio", "item.basemetals.diamond_crackhammer": "Mazza Diamante", @@ -761,8 +761,8 @@ "block.basemetals.steel": "Molten Steel", "block.basemetals.tin": "Molten Tin", "block.basemetals.zinc": "Molten Zinc", - "block.basemetals.charcoal": "Molten Charcoal", - "block.basemetals.coal": "Molten Coal", + "block.basemetals.charcoal": "Carbonella liquefatta", + "block.basemetals.coal": "Carbone liquefatto", "block.basemetals.diamond": "Molten Diamond", "block.basemetals.emerald": "Molten Emerald", "block.basemetals.ender": "Molten Ender", @@ -1586,5 +1586,30 @@ "slurry.basemetals.clean_zinc": "Clean Zinc Slurry", "advancements.basemetals.cupronickel_maker.title": "Cupronickel Maker", "advancements.basemetals.pewter_maker.title": "Pewter Maker", - "advancements.basemetals.pewter_maker.description": "Progress through Base Metals: Pewter Maker." -} \ No newline at end of file + "advancements.basemetals.pewter_maker.description": "Fondi peltro da una miscela di polveri di stagno, rame e piombo", + "config.basemetals.title": "Impostazioni di Base Metals", + "config.basemetals.contentMode": "Modalità dei contenuti", + "config.basemetals.contentMode.tooltip": "Scegli quanta libertà hai nel creare oggetti con i metalli. La generazione dei minerali non cambia.", + "config.basemetals.content_mode.high_fantasy": "Alta fantasia", + "config.basemetals.content_mode.low_fantasy": "Bassa fantasia", + "config.basemetals.content_mode.high_fantasy.description": "Crea liberamente con tutti i metalli. Sono disponibili tutte le ricette, gli scambi e gli oggetti nei bauli.", + "config.basemetals.content_mode.low_fantasy.description": "Mantieni i metalli fantastici, ma limita ciò che puoi creare con ogni materiale. Niente archi, balestre o canne da pesca di Base Metals.", + "config.basemetals.specialEffects": "Effetti speciali dell’equipaggiamento", + "config.basemetals.specialEffects.tooltip": "Dà ad alcuni metalli effetti speciali di armatura e combattimento, come respirare sott’acqua con un’armatura completa di Aquarium.", + "config.basemetals.starsteelRegeneration": "Autoriparazione dell’acciaio stellare", + "config.basemetals.starsteelRegeneration.tooltip": "L’equipaggiamento di acciaio stellare si ripara mentre lo impugni: 1 punto di durabilità ogni 10 secondi. L’armatura non si autoripara.", + "config.basemetals.mercuryImmersionEffects": "Avvelenamento da mercurio", + "config.basemetals.mercuryImmersionEffects.tooltip": "Toccare il mercurio liquido può provocare nausea.", + "config.basemetals.villagerTrades": "Scambi con i villici", + "config.basemetals.villagerTrades.tooltip": "Permette ai fabbri di vendere lingotti ed equipaggiamento di Base Metals.", + "config.basemetals.defaults": "Valori predefiniti", + "config.basemetals.undo": "Annulla modifiche", + "config.basemetals.confirm.title": "Cambiare modalità dei contenuti?", + "config.basemetals.confirm.message": "Riavvia Minecraft per usare la nuova modalità. Puoi continuare a usare ciò che possiedi. Per giocare su un server, scegli la sua stessa modalità.", + "config.basemetals.restart": "Riavvia Minecraft dopo aver cambiato modalità. La scelta vale per tutti i tuoi mondi. Usa OreSpawn per cambiare dove si generano i minerali.", + "config.basemetals.connection.mismatch": "Questo server usa %s, ma il tuo gioco usa %s. Scegli la stessa modalità in Mods → Base Metals → Config e riavvia Minecraft.", + "fluid.basemetals.coal.name": "Carbone liquefatto", + "item.bucket.coal": "Secchio di carbone liquefatto", + "fluid.basemetals.charcoal.name": "Carbonella liquefatta", + "item.bucket.charcoal": "Secchio di carbonella liquefatta" +} diff --git a/src/generated/resources/assets/basemetals/lang/ja_jp.json b/src/generated/resources/assets/basemetals/lang/ja_jp.json index 40b7299f..984a2976 100644 --- a/src/generated/resources/assets/basemetals/lang/ja_jp.json +++ b/src/generated/resources/assets/basemetals/lang/ja_jp.json @@ -4,16 +4,16 @@ "itemGroup.basemetals.combat": "Base Metals: 戦闘", "itemGroup.basemetals.items": "Base Metals: アイテム", "itemGroup.basemetals.tools": "Base Metals: 道具", - "tooltip.adamantine.tool": "体力が高いMobに %d の追加ダメージ", - "tooltip.adamantine.armor": "被ダメージ減少", - "tooltip.aquarium.tool": "水棲Mobに %d の追加ダメージ", - "tooltip.aquarium.armor": "セット効果: 水中呼吸", - "tooltip.coldiron.tool": "火炎耐性のあるMobに %d の追加ダメージ", - "tooltip.coldiron.armor": "セット効果: 火炎耐性", - "tooltip.mithril.tool": "アンデッドに盲目とウィザー効果", - "tooltip.mithril.armor": "セット効果: 毒＆ウィザー耐性", - "tooltip.starsteel.tool": "%d 秒ごとに 1 の耐久力を回復", - "tooltip.starsteel.armor": "移動速度＆跳躍力上昇", + "tooltip.adamantine.tool": "近接攻撃：最大体力がハート10個を超える敵に追加ダメージ %d", + "tooltip.adamantine.armor": "2部位で耐性 I、防具一式で耐性 II", + "tooltip.aquarium.tool": "近接攻撃：水中で呼吸できる敵に追加ダメージ %d", + "tooltip.aquarium.armor": "水中で防具一式を装備：水中呼吸、耐性、採掘速度低下を解除", + "tooltip.coldiron.tool": "近接攻撃：火に耐性を持つ敵に追加ダメージ %d", + "tooltip.coldiron.armor": "防具一式：火炎耐性", + "tooltip.mithril.tool": "近接攻撃でアンデッドに3秒間の盲目とウィザー効果", + "tooltip.mithril.armor": "防具一式：有害なポーション効果を解除", + "tooltip.starsteel.tool": "手に持つと自己修復：%d秒ごとに耐久値が1回復", + "tooltip.starsteel.armor": "装備する部位が増えるほど高く跳べます。2部位以上で移動速度も上昇", "item.basemetals.adamantine_axe": "アダマントの斧", "item.basemetals.aquarium_axe": "アクアリウムの斧", "item.basemetals.antimony_axe": "アンチモンの斧", @@ -898,8 +898,8 @@ "item.bucket.bismuth": "溶融ビスマスバケツ", "item.bucket.brass": "溶融黄銅バケツ", "item.bucket.bronze": "溶融青銅バケツ", - "item.bucket.charcoal": "液化木炭バケツ", - "item.bucket.coal": "液化石炭バケツ", + "item.bucket.charcoal": "液化木炭入りバケツ", + "item.bucket.coal": "液化石炭入りバケツ", "item.bucket.coldiron": "溶融コールドアイアンバケツ", "item.bucket.copper": "溶融銅バケツ", "item.bucket.cupronickel": "溶融白銅バケツ", @@ -1848,7 +1848,7 @@ "advancements.basemetals.blocktastic.title": "Blocktastic", "advancements.basemetals.blocktastic.description": "Progress through Base Metals: Blocktastic.", "advancements.basemetals.geologist.title": "Geologist", - "advancements.basemetals.geologist.description": "Progress through Base Metals: Geologist.", + "advancements.basemetals.geologist.description": "Crack Hammer を作る", "advancements.basemetals.metallurgy.title": "Metallurgy", "advancements.basemetals.metallurgy.description": "Progress through Base Metals: Metallurgy.", "advancements.basemetals.brass_maker.title": "Brass Maker", @@ -1860,15 +1860,15 @@ "advancements.basemetals.electrum_maker.title": "Electrum Maker", "advancements.basemetals.electrum_maker.description": "Progress through Base Metals: Electrum Maker.", "advancements.basemetals.steel_maker.title": "Steel Maker", - "advancements.basemetals.steel_maker.description": "Progress through Base Metals: Steel Maker.", + "advancements.basemetals.steel_maker.description": "鉄と石炭の粉末を混ぜて精錬し、鋼を作る", "advancements.basemetals.invar_maker.title": "Invar Maker", "advancements.basemetals.invar_maker.description": "Progress through Base Metals: Invar Maker.", "advancements.basemetals.mithril_maker.title": "Mithril Maker", "advancements.basemetals.mithril_maker.description": "Progress through Base Metals: Mithril Maker.", "advancements.basemetals.aquarium_maker.title": "Aquarium Maker", - "advancements.basemetals.aquarium_maker.description": "Progress through Base Metals: Aquarium Maker.", + "advancements.basemetals.aquarium_maker.description": "銅、亜鉛、プリズマリンの粉末を混ぜて精錬し、Aquarium を作る", "advancements.basemetals.pewter_maker.title": "Pewter Maker", - "advancements.basemetals.pewter_maker.description": "Progress through Base Metals: Pewter Maker.", + "advancements.basemetals.pewter_maker.description": "スズ、銅、鉛の粉末を混ぜて精錬し、ピューターを作る", "advancements.basemetals.angel_of_death.title": "Angel Of Death", "advancements.basemetals.angel_of_death.description": "Progress through Base Metals: Angel Of Death.", "advancements.basemetals.scuba_diver.title": "Scuba Diver", @@ -1878,5 +1878,26 @@ "advancements.basemetals.juggernaut.title": "Juggernaut", "advancements.basemetals.juggernaut.description": "Progress through Base Metals: Juggernaut.", "advancements.basemetals.moon_boots.title": "Moon Boots", - "advancements.basemetals.moon_boots.description": "Progress through Base Metals: Moon Boots." -} \ No newline at end of file + "advancements.basemetals.moon_boots.description": "Progress through Base Metals: Moon Boots.", + "config.basemetals.title": "Base Metals の設定", + "config.basemetals.contentMode": "コンテンツモード", + "config.basemetals.contentMode.tooltip": "金属でどこまで自由に作れるかを選びます。鉱石の生成は変わりません。", + "config.basemetals.content_mode.high_fantasy": "ハイファンタジー", + "config.basemetals.content_mode.low_fantasy": "ローファンタジー", + "config.basemetals.content_mode.high_fantasy.description": "すべての金属を自由に使えます。全レシピ、村人の取引、チェストのアイテムが利用できます。", + "config.basemetals.content_mode.low_fantasy.description": "幻想的な金属は残し、素材ごとに作れる物を制限します。Base Metals の弓、クロスボウ、釣り竿は入手できません。", + "config.basemetals.specialEffects": "装備の特殊効果", + "config.basemetals.specialEffects.tooltip": "一部の金属に防具や近接攻撃の特殊効果を付けます。Aquarium の防具一式なら水中で呼吸できます。", + "config.basemetals.starsteelRegeneration": "星鋼の自己修復", + "config.basemetals.starsteelRegeneration.tooltip": "手に持った星鋼の装備は10秒ごとに耐久値が1回復します。防具は自己修復しません。", + "config.basemetals.mercuryImmersionEffects": "水銀中毒", + "config.basemetals.mercuryImmersionEffects.tooltip": "液体の水銀に触れると、吐き気が起こることがあります。", + "config.basemetals.villagerTrades": "村人との取引", + "config.basemetals.villagerTrades.tooltip": "鍛冶職の村人が Base Metals のインゴットや装備を売るようにします。", + "config.basemetals.defaults": "初期値に戻す", + "config.basemetals.undo": "変更を戻す", + "config.basemetals.confirm.title": "コンテンツモードを変更しますか？", + "config.basemetals.confirm.message": "新しいモードを使うには Minecraft を再起動してください。持っている物は引き続き使えます。サーバーで遊ぶときは、サーバーと同じモードを選んでください。", + "config.basemetals.restart": "モードを変えたら Minecraft を再起動してください。この選択はすべてのワールドに適用されます。鉱石の生成場所は OreSpawn で変更できます。", + "config.basemetals.connection.mismatch": "サーバーは %s、あなたのゲームは %s を使っています。Mods → Base Metals → Config で同じモードを選び、Minecraft を再起動してください。" +} diff --git a/src/generated/resources/assets/basemetals/lang/nl_nl.json b/src/generated/resources/assets/basemetals/lang/nl_nl.json index 15443e18..5d9b5140 100644 --- a/src/generated/resources/assets/basemetals/lang/nl_nl.json +++ b/src/generated/resources/assets/basemetals/lang/nl_nl.json @@ -379,16 +379,16 @@ "block.basemetals.zinc_plate": "Zink Plaat", "block.basemetals.iron_plate": "IJzer Plaat", "block.basemetals.gold_plate": "Goud Plaat", - "tooltip.adamantine.tool": "+%x schade tegen sterke vijanden", - "tooltip.aquarium.tool": "+%x schade tegen water vijanden", - "tooltip.coldiron.tool": "+%x schade tegen vuur vijanden", - "tooltip.mithril.tool": "Verblind en withered de ondoodde", - "tooltip.starsteel.tool": "Repareert 1 gebruik elke %x seconden", - "tooltip.adamantine.armor": "Vermindert schade", - "tooltip.aquarium.armor": "Bij volledige set: ademen onderwater", - "tooltip.coldiron.armor": "Bij volledige set: imuun voor vuur", - "tooltip.mithril.armor": "Bij volledige set: verdediging tegen vergiftiging en wither", - "tooltip.starsteel.armor": "Verlaagt je gewicht", + "tooltip.adamantine.tool": "Melee-treffers: +%d schade aan vijanden met meer dan 10 hartjes maximale gezondheid", + "tooltip.aquarium.tool": "Melee-treffers: +%d schade aan vijanden die onder water ademen", + "tooltip.coldiron.tool": "Melee-treffers: +%d schade aan vijanden die immuun zijn voor vuur", + "tooltip.mithril.tool": "Melee-treffers verblinden ondoden en veroorzaken 3 seconden Wither", + "tooltip.starsteel.tool": "Repareert zichzelf in je hand: 1 duurzaamheid elke %d seconden", + "tooltip.adamantine.armor": "Twee stukken geven Weerstand I; een volledig pantser geeft Weerstand II", + "tooltip.aquarium.armor": "Volledig pantser in water: onder water ademen, weerstand en geen Mijnmoeheid", + "tooltip.coldiron.armor": "Volledig pantser: Vuurbestendigheid", + "tooltip.mithril.armor": "Volledig pantser: verwijdert schadelijke drankeffecten", + "tooltip.starsteel.armor": "Spring hoger met elk stuk; vanaf twee stukken krijg je ook extra snelheid", "advancements.basemetals.this_is_new.title": "Dit is nieuw...", "advancements.basemetals.blocktastic.title": "Bloktastisch!", "advancements.basemetals.geologist.title": "Geologist", @@ -407,14 +407,14 @@ "advancements.basemetals.moon_boots.title": "Maan wandelaar", "advancements.basemetals.this_is_new.description": "Smelt een metaal uit de BaseMetals mod", "advancements.basemetals.blocktastic.description": "Plaats een blok van een metaal dat geen ijzer of goud is", - "advancements.basemetals.geologist.description": "Maak een hamer met een metalen blok", + "advancements.basemetals.geologist.description": "Maak een Crack Hammer", "advancements.basemetals.brass_maker.description": "Combineer koper en zink om messing te maken", "advancements.basemetals.bronze_maker.description": "Combineer verpulverd koper en tin om brons te maken", "advancements.basemetals.electrum_maker.description": "Combineer verpulverd zilver en goud om electrum te maken", - "advancements.basemetals.steel_maker.description": "Combineer verpulverd ijzer en houtskool om staal te maken", + "advancements.basemetals.steel_maker.description": "Smelt staal uit een mengsel van ijzer- en steenkoolpoeder", "advancements.basemetals.invar_maker.description": "Combineer verpulverd ijzer en nikkel om invar te maken", "advancements.basemetals.mithril_maker.description": "Combineer verpulverd silver, cold-iron en kwik om mithril te maken", - "advancements.basemetals.aquarium_maker.description": "Combineer verpulverd koper en zink met prismarine kristallen om aquarium te maken", + "advancements.basemetals.aquarium_maker.description": "Smelt Aquarium uit een mengsel van koper-, zink- en prismarijnpoeder", "advancements.basemetals.metallurgy.description": "Maak een legering", "advancements.basemetals.demon_slayer.description": "Draag een compleet harnas van cold-iron en hou een cold-iron zwaard vast", "advancements.basemetals.angel_of_death.description": "Draag een compleet harnas van mithril en hou een mithril zwaard vast", @@ -760,8 +760,8 @@ "block.basemetals.steel": "Molten Steel", "block.basemetals.tin": "Molten Tin", "block.basemetals.zinc": "Molten Zinc", - "block.basemetals.charcoal": "Molten Charcoal", - "block.basemetals.coal": "Molten Coal", + "block.basemetals.charcoal": "Vloeibare houtskool", + "block.basemetals.coal": "Vloeibare steenkool", "block.basemetals.diamond": "Molten Diamond", "block.basemetals.emerald": "Molten Emerald", "block.basemetals.ender": "Molten Ender", @@ -1567,5 +1567,30 @@ "slurry.basemetals.clean_zinc": "Clean Zinc Slurry", "advancements.basemetals.cupronickel_maker.title": "Cupronickel Maker", "advancements.basemetals.pewter_maker.title": "Pewter Maker", - "advancements.basemetals.pewter_maker.description": "Progress through Base Metals: Pewter Maker." -} \ No newline at end of file + "advancements.basemetals.pewter_maker.description": "Smelt Pewter uit een mengsel van tin-, koper- en loodpoeder", + "config.basemetals.title": "Base Metals-instellingen", + "config.basemetals.contentMode": "Inhoudsmodus", + "config.basemetals.contentMode.tooltip": "Kies hoe vrij je met metalen kunt bouwen en maken. Ertsgeneratie blijft hetzelfde.", + "config.basemetals.content_mode.high_fantasy": "High Fantasy", + "config.basemetals.content_mode.low_fantasy": "Low Fantasy", + "config.basemetals.content_mode.high_fantasy.description": "Gebruik elk metaal vrij. Alle recepten, dorpelingenhandel en buit in kisten zijn beschikbaar.", + "config.basemetals.content_mode.low_fantasy.description": "Behoud fantasiemetalen, maar beperk wat je van elk materiaal kunt maken. Geen Base Metals-bogen, kruisbogen of hengels.", + "config.basemetals.specialEffects": "Speciale uitrustingseffecten", + "config.basemetals.specialEffects.tooltip": "Geeft bepaalde metalen speciale pantser- en gevechtseffecten, zoals onder water ademen met een volledig Aquarium-pantser.", + "config.basemetals.starsteelRegeneration": "Starsteel-zelfreparatie", + "config.basemetals.starsteelRegeneration.tooltip": "Starsteel-uitrusting repareert zichzelf in je hand: 1 duurzaamheid elke 10 seconden. Pantser repareert zichzelf niet.", + "config.basemetals.mercuryImmersionEffects": "Kwikvergiftiging", + "config.basemetals.mercuryImmersionEffects.tooltip": "Vloeibaar kwik aanraken kan je misselijk maken.", + "config.basemetals.villagerTrades": "Handel met dorpelingen", + "config.basemetals.villagerTrades.tooltip": "Laat smeden Base Metals-baren en uitrusting verkopen.", + "config.basemetals.defaults": "Standaardwaarden", + "config.basemetals.undo": "Wijzigingen ongedaan maken", + "config.basemetals.confirm.title": "Inhoudsmodus wijzigen?", + "config.basemetals.confirm.message": "Herstart Minecraft om de nieuwe modus te gebruiken. Alles wat je al hebt blijft bruikbaar. Kies dezelfde modus als de server om daar te spelen.", + "config.basemetals.restart": "Herstart Minecraft na een moduswijziging. Deze keuze geldt voor al je werelden. Gebruik OreSpawn om te veranderen waar ertsen ontstaan.", + "config.basemetals.connection.mismatch": "Deze server gebruikt %s, maar jouw spel gebruikt %s. Kies dezelfde modus in Mods → Base Metals → Config en herstart Minecraft.", + "fluid.basemetals.coal.name": "Vloeibare steenkool", + "item.bucket.coal": "Emmer vloeibare steenkool", + "fluid.basemetals.charcoal.name": "Vloeibare houtskool", + "item.bucket.charcoal": "Emmer vloeibare houtskool" +} diff --git a/src/generated/resources/assets/basemetals/lang/pt_br.json b/src/generated/resources/assets/basemetals/lang/pt_br.json index 3a06996f..4687b111 100644 --- a/src/generated/resources/assets/basemetals/lang/pt_br.json +++ b/src/generated/resources/assets/basemetals/lang/pt_br.json @@ -379,16 +379,16 @@ "block.basemetals.zinc_plate": "Chapa de Zinco", "block.basemetals.iron_plate": "Chapa de Ferro", "block.basemetals.gold_plate": "Chapa de Ouro", - "tooltip.adamantine.tool": "+%x dano aos inimigos poderosos", - "tooltip.aquarium.tool": "+%x dano aos inimigos de água", - "tooltip.coldiron.tool": "+%x dano aos demônios", - "tooltip.mithril.tool": "Fere o mortos-vivos", - "tooltip.starsteel.tool": "Reparação automática", - "tooltip.adamantine.armor": "Reduz o dano recebido", - "tooltip.aquarium.armor": "Respirar debaixo d\u0027água", - "tooltip.coldiron.armor": "Imunidade fogo", - "tooltip.mithril.armor": "Proteção contra veneno e murchar", - "tooltip.starsteel.armor": "Menos gravidade", + "tooltip.adamantine.tool": "Golpes corpo a corpo: +%d de dano contra inimigos com mais de 10 corações de vida máxima", + "tooltip.aquarium.tool": "Golpes corpo a corpo: +%d de dano contra inimigos que respiram debaixo d’água", + "tooltip.coldiron.tool": "Golpes corpo a corpo: +%d de dano contra inimigos imunes ao fogo", + "tooltip.mithril.tool": "Golpes corpo a corpo cegam mortos-vivos e causam Wither por 3 segundos", + "tooltip.starsteel.tool": "Repara-se enquanto você segura: 1 ponto de durabilidade a cada %d segundos", + "tooltip.adamantine.armor": "Duas peças dão Resistência I; a armadura completa dá Resistência II", + "tooltip.aquarium.armor": "Armadura completa na água: respiração aquática, resistência e remove a fadiga de mineração", + "tooltip.coldiron.armor": "Armadura completa: Resistência ao fogo", + "tooltip.mithril.armor": "Armadura completa: remove efeitos nocivos de poções", + "tooltip.starsteel.armor": "Pule mais alto com cada peça; duas ou mais também aumentam a velocidade", "advancements.basemetals.this_is_new.title": "Isso é novo ...", "advancements.basemetals.blocktastic.title": "Bloco!", "advancements.basemetals.geologist.title": "Geólogo", @@ -407,14 +407,14 @@ "advancements.basemetals.moon_boots.title": "Lua Walker", "advancements.basemetals.this_is_new.description": "Smelt um novo metal dos Metais Básicos mod", "advancements.basemetals.blocktastic.description": "Coloque um bloco de metal que não é nem ferro nem ouro", - "advancements.basemetals.geologist.description": "Faça um martelo a partir de um bloco de metal", + "advancements.basemetals.geologist.description": "Crie um Crack Hammer", "advancements.basemetals.brass_maker.description": "Combine cobre e zinco em pó para fazer bronze", "advancements.basemetals.bronze_maker.description": "Combine cobre em pó e estanho para fazer o bronze", "advancements.basemetals.electrum_maker.description": "Combine prata em pó e ouro para fazer electrum", - "advancements.basemetals.steel_maker.description": "Combine ferro em pó e carvão em pó para produzir aço", + "advancements.basemetals.steel_maker.description": "Funda aço com uma mistura de pós de ferro e carvão", "advancements.basemetals.invar_maker.description": "Combine pó de ferro e níquel para fazer invar", "advancements.basemetals.mithril_maker.description": "Combine prata em pó, ferro-frio e mercúrio para fazer mithril", - "advancements.basemetals.aquarium_maker.description": "Combine cobre e zinco em pó com cristais prismarine para fazer aquário", + "advancements.basemetals.aquarium_maker.description": "Funda Aquarium com uma mistura de pós de cobre, zinco e prismarinho", "advancements.basemetals.metallurgy.description": "Craft qualquer mistura de liga", "advancements.basemetals.demon_slayer.description": "Usar um terno completo de armadura de ferro-frio e empunhar uma espada de ferro-frio", "advancements.basemetals.angel_of_death.description": "Usar um terno completo de armadura mithril e empunhar uma espada mithril", @@ -760,8 +760,8 @@ "block.basemetals.steel": "Molten Steel", "block.basemetals.tin": "Molten Tin", "block.basemetals.zinc": "Molten Zinc", - "block.basemetals.charcoal": "Molten Charcoal", - "block.basemetals.coal": "Molten Coal", + "block.basemetals.charcoal": "Carvão vegetal liquefeito", + "block.basemetals.coal": "Carvão liquefeito", "block.basemetals.diamond": "Molten Diamond", "block.basemetals.emerald": "Molten Emerald", "block.basemetals.ender": "Molten Ender", @@ -1568,5 +1568,30 @@ "slurry.basemetals.clean_zinc": "Clean Zinc Slurry", "advancements.basemetals.cupronickel_maker.title": "Cupronickel Maker", "advancements.basemetals.pewter_maker.title": "Pewter Maker", - "advancements.basemetals.pewter_maker.description": "Progress through Base Metals: Pewter Maker." -} \ No newline at end of file + "advancements.basemetals.pewter_maker.description": "Funda peltre com uma mistura de pós de estanho, cobre e chumbo", + "config.basemetals.title": "Configurações do Base Metals", + "config.basemetals.contentMode": "Modo de conteúdo", + "config.basemetals.contentMode.tooltip": "Escolha quanta liberdade você tem ao criar objetos com metais. A geração de minérios não muda.", + "config.basemetals.content_mode.high_fantasy": "Alta fantasia", + "config.basemetals.content_mode.low_fantasy": "Baixa fantasia", + "config.basemetals.content_mode.high_fantasy.description": "Crie livremente com todos os metais. Todas as receitas, trocas com aldeões e itens em baús ficam disponíveis.", + "config.basemetals.content_mode.low_fantasy.description": "Mantenha os metais fantásticos, mas limite o que pode criar com cada material. Sem arcos, bestas ou varas de pesca do Base Metals.", + "config.basemetals.specialEffects": "Efeitos especiais dos equipamentos", + "config.basemetals.specialEffects.tooltip": "Dá a certos metais efeitos especiais de armadura e combate, como respirar debaixo d’água com uma armadura completa de Aquarium.", + "config.basemetals.starsteelRegeneration": "Autorreparo do aço estelar", + "config.basemetals.starsteelRegeneration.tooltip": "Equipamentos de aço estelar se reparam enquanto você os segura: 1 ponto de durabilidade a cada 10 segundos. A armadura não se repara sozinha.", + "config.basemetals.mercuryImmersionEffects": "Intoxicação por mercúrio", + "config.basemetals.mercuryImmersionEffects.tooltip": "Tocar mercúrio líquido pode causar náusea.", + "config.basemetals.villagerTrades": "Trocas com aldeões", + "config.basemetals.villagerTrades.tooltip": "Permite que ferreiros vendam lingotes e equipamentos do Base Metals.", + "config.basemetals.defaults": "Valores padrão", + "config.basemetals.undo": "Desfazer alterações", + "config.basemetals.confirm.title": "Mudar o modo de conteúdo?", + "config.basemetals.confirm.message": "Reinicie o Minecraft para usar o novo modo. Você pode continuar usando tudo que já tem. Para jogar em um servidor, escolha o mesmo modo dele.", + "config.basemetals.restart": "Reinicie o Minecraft após mudar de modo. A escolha vale para todos os seus mundos. Use o OreSpawn para mudar onde os minérios aparecem.", + "config.basemetals.connection.mismatch": "Este servidor usa %s, mas seu jogo usa %s. Escolha o mesmo modo em Mods → Base Metals → Config e reinicie o Minecraft.", + "fluid.basemetals.coal.name": "Carvão liquefeito", + "item.bucket.coal": "Balde de carvão liquefeito", + "fluid.basemetals.charcoal.name": "Carvão vegetal liquefeito", + "item.bucket.charcoal": "Balde de carvão vegetal liquefeito" +} diff --git a/src/generated/resources/assets/basemetals/lang/ru_ru.json b/src/generated/resources/assets/basemetals/lang/ru_ru.json index 8ff9e4f6..ca4ce217 100644 --- a/src/generated/resources/assets/basemetals/lang/ru_ru.json +++ b/src/generated/resources/assets/basemetals/lang/ru_ru.json @@ -3,16 +3,16 @@ "itemGroup.basemetals.blocks": "Base Metals: Блоки", "itemGroup.basemetals.items": "Base Metals: Предметы", "itemGroup.basemetals.tools": "Base Metals: Инструменты", - "tooltip.adamantine.tool": "+%d урон по сильным врагам", - "tooltip.adamantine.armor": "Снижает получаемый урон", - "tooltip.aquarium.tool": "+%d урон по водным врагам", - "tooltip.aquarium.armor": "Полный сэт: подводное дыхание", - "tooltip.coldiron.tool": "+%d урон по огненным врагам", - "tooltip.coldiron.armor": "Полный сэт: иммунитет к огню", - "tooltip.mithril.tool": "Ослепляет и иссушает нежить", - "tooltip.mithril.armor": "Полный сэт: защита от яда и удушения", - "tooltip.starsteel.tool": "Восстанавливает одно повреждение каждые %d секунд", - "tooltip.starsteel.armor": "Уменьшает Ваш вес", + "tooltip.adamantine.tool": "Удары в ближнем бою: +%d урона врагам с максимальным здоровьем более 10 сердец", + "tooltip.adamantine.armor": "Две части дают Сопротивление I; полный комплект — Сопротивление II", + "tooltip.aquarium.tool": "Удары в ближнем бою: +%d урона врагам, которые дышат под водой", + "tooltip.aquarium.armor": "Полный комплект в воде: подводное дыхание, сопротивление и снятие усталости", + "tooltip.coldiron.tool": "Удары в ближнем бою: +%d урона врагам, невосприимчивым к огню", + "tooltip.coldiron.armor": "Полный комплект: Огнестойкость", + "tooltip.mithril.tool": "Удары в ближнем бою ослепляют нежить и накладывают иссушение на 3 секунды", + "tooltip.mithril.armor": "Полный комплект: снимает вредные эффекты зелий", + "tooltip.starsteel.tool": "Восстанавливается в руке: 1 единица прочности каждые %d секунд", + "tooltip.starsteel.armor": "Каждая часть повышает прыжок; две и более также увеличивают скорость", "advancements.basemetals.aquarium_maker.title": "Аквариум", "advancements.basemetals.angel_of_death.title": "Ангел смерти", "advancements.basemetals.brass_maker.title": "Латунь", @@ -30,7 +30,7 @@ "advancements.basemetals.scuba_diver.title": "Аквалангист", "advancements.basemetals.steel_maker.title": "Сталь", "advancements.basemetals.this_is_new.title": "Это новая...", - "advancements.basemetals.aquarium_maker.description": "Смешайте измельчённую медный и цинк с кристаллами призмырина, чтобы создать аквариум", + "advancements.basemetals.aquarium_maker.description": "Выплавите аквариум из смеси медного, цинкового и призмаринового порошков", "advancements.basemetals.angel_of_death.description": "Наденьте полный сэт из мифриловой брони и обладайте мечом мифрила", "advancements.basemetals.brass_maker.description": "Смешайте измельчённые медь и цинк, чтобы создать латунь", "advancements.basemetals.bronze_maker.description": "Смешайте измельчённые медь и олово чтобы создать bronze", @@ -38,14 +38,14 @@ "advancements.basemetals.cupronickel_maker.description": "Смешайте измельчённые медь и никель чтобы создать мельхиор", "advancements.basemetals.demon_slayer.description": "Носите полный сэт из холодно-железной брони и обладайте холодным железным мечом", "advancements.basemetals.electrum_maker.description": "Смешайте измельчённые серебро и золото чтобы создать электрум", - "advancements.basemetals.geologist.description": "Сделайте молот из металлического блока", + "advancements.basemetals.geologist.description": "Создайте Crack Hammer", "advancements.basemetals.invar_maker.description": "Смешайте измельчённые железо и никель чтобы создать инвар", "advancements.basemetals.juggernaut.description": "Наденьте полный сэт адамантовой брони", "advancements.basemetals.metallurgy.description": "Создайте любой сплав", "advancements.basemetals.mithril_maker.description": "Смешайте измельчённые серебро, холодное железо и ртуть чтобы создать мифрил", "advancements.basemetals.moon_boots.description": "Наденьте пару сапог из звёздной стали", "advancements.basemetals.scuba_diver.description": "Наденьте полный сэт аквариумной брони и плавайте под водой", - "advancements.basemetals.steel_maker.description": "Смешайте измельчённые железо и древевсный уголь чтобы создать сталь", + "advancements.basemetals.steel_maker.description": "Выплавите сталь из смеси железного и угольного порошков", "advancements.basemetals.this_is_new.description": "Выплавка новых металлов из мода Base Metals", "item.basemetals.adamantine_axe": "Адамантиновый топор", "item.basemetals.aquarium_axe": "Аквариумовый топор", @@ -851,8 +851,8 @@ "fluid.basemetals.bismuth.name": "Расплавленный висмут", "fluid.basemetals.brass.name": "Расплавленная латунь", "fluid.basemetals.bronze.name": "Расплавленная бронза", - "fluid.basemetals.charcoal.name": "Расплавленный древесный уголь", - "fluid.basemetals.coal.name": "Расплавленный уголь", + "fluid.basemetals.charcoal.name": "Жидкий древесный уголь", + "fluid.basemetals.coal.name": "Жидкий уголь", "fluid.basemetals.coldiron.name": "Расплавленное хладо-железо", "fluid.basemetals.copper.name": "Расплавленная медь", "fluid.basemetals.cupronickel.name": "Расплавленный мельхиор", @@ -883,8 +883,8 @@ "block.basemetals.bismuth": "Расплавленный висмут", "block.basemetals.brass": "Расплавленная латунь", "block.basemetals.bronze": "Расплавленная бронза", - "block.basemetals.charcoal": "Расплавленный древесный уголь", - "block.basemetals.coal": "Расплавленный уголь", + "block.basemetals.charcoal": "Жидкий древесный уголь", + "block.basemetals.coal": "Жидкий уголь", "block.basemetals.coldiron": "Расплавленное хладо-железо", "block.basemetals.copper": "Расплавленная медь", "block.basemetals.cupronickel": "Расплавленный мельхиор", @@ -915,8 +915,8 @@ "item.bucket.bismuth": "Ведро Расплавленного висмута", "item.bucket.brass": "Ведро Расплавленной латуни", "item.bucket.bronze": "Ведро Расплавленной бронзы", - "item.bucket.charcoal": "Ведро Расплавленного древесного уголя", - "item.bucket.coal": "Ведро Расплавленного уголя", + "item.bucket.charcoal": "Ведро жидкого древесного угля", + "item.bucket.coal": "Ведро жидкого угля", "item.bucket.coldiron": "Ведро Расплавленного хладо-железа", "item.bucket.copper": "Ведро Расплавленной меди", "item.bucket.cupronickel": "Ведро Расплавленного мельхиора", @@ -1854,5 +1854,26 @@ "slurry.basemetals.dirty_zinc": "Dirty Zinc Slurry", "slurry.basemetals.clean_zinc": "Clean Zinc Slurry", "advancements.basemetals.pewter_maker.title": "Pewter Maker", - "advancements.basemetals.pewter_maker.description": "Progress through Base Metals: Pewter Maker." -} \ No newline at end of file + "advancements.basemetals.pewter_maker.description": "Выплавите пьютер из смеси оловянного, медного и свинцового порошков", + "config.basemetals.title": "Настройки Base Metals", + "config.basemetals.contentMode": "Режим содержимого", + "config.basemetals.contentMode.tooltip": "Выберите, насколько свободно можно создавать предметы из металлов. Генерация руд не меняется.", + "config.basemetals.content_mode.high_fantasy": "Высокое фэнтези", + "config.basemetals.content_mode.low_fantasy": "Низкое фэнтези", + "config.basemetals.content_mode.high_fantasy.description": "Свободно используйте все металлы. Доступны все рецепты, торговля с жителями и находки в сундуках.", + "config.basemetals.content_mode.low_fantasy.description": "Сохраняет фантастические металлы, но ограничивает, что можно сделать из каждого материала. Без луков, арбалетов и удочек Base Metals.", + "config.basemetals.specialEffects": "Особые эффекты снаряжения", + "config.basemetals.specialEffects.tooltip": "Даёт некоторым металлам особые эффекты брони и ближнего боя. Например, полный комплект брони из аквариума позволяет дышать под водой.", + "config.basemetals.starsteelRegeneration": "Самовосстановление звёздной стали", + "config.basemetals.starsteelRegeneration.tooltip": "Снаряжение из звёздной стали восстанавливает 1 единицу прочности каждые 10 секунд, пока вы держите его в руке. Броня не восстанавливается.", + "config.basemetals.mercuryImmersionEffects": "Отравление ртутью", + "config.basemetals.mercuryImmersionEffects.tooltip": "Прикосновение к жидкой ртути может вызвать тошноту.", + "config.basemetals.villagerTrades": "Торговля с жителями", + "config.basemetals.villagerTrades.tooltip": "Позволяет кузнецам продавать слитки и снаряжение Base Metals.", + "config.basemetals.defaults": "По умолчанию", + "config.basemetals.undo": "Отменить изменения", + "config.basemetals.confirm.title": "Изменить режим содержимого?", + "config.basemetals.confirm.message": "Перезапустите Minecraft, чтобы использовать новый режим. Все ваши предметы останутся пригодными. Для игры на сервере выберите тот же режим, что и на нём.", + "config.basemetals.restart": "После смены режима перезапустите Minecraft. Выбор действует во всех ваших мирах. Места появления руд настраиваются в OreSpawn.", + "config.basemetals.connection.mismatch": "Этот сервер использует %s, а ваша игра — %s. Выберите тот же режим в Mods → Base Metals → Config и перезапустите Minecraft." +} diff --git a/src/generated/resources/assets/basemetals/lang/zh_cn.json b/src/generated/resources/assets/basemetals/lang/zh_cn.json index da77e508..35c76a7b 100644 --- a/src/generated/resources/assets/basemetals/lang/zh_cn.json +++ b/src/generated/resources/assets/basemetals/lang/zh_cn.json @@ -4,16 +4,16 @@ "itemGroup.basemetals.combat": "Base Metals Combat", "itemGroup.basemetals.items": "Base Metals物品", "itemGroup.basemetals.tools": "Base Metals工具", - "tooltip.adamantine.tool": "+%x 对坚硬敌人伤害", - "tooltip.adamantine.armor": "抗性提升", - "tooltip.aquarium.tool": "+%x 对水中敌人伤害", - "tooltip.aquarium.armor": "套装效果：水下呼吸", - "tooltip.coldiron.tool": "+%x 对火焰敌人伤害", - "tooltip.coldiron.armor": "套装效果：防火", - "tooltip.mithril.tool": "使不死生物失明并凋零", - "tooltip.mithril.armor": "套装效果：减少受到剧毒和凋零的伤害", - "tooltip.starsteel.tool": "每 %x 秒自动回复耐久", - "tooltip.starsteel.armor": "根据装备数量，增加跳跃提升、速度", + "tooltip.adamantine.tool": "近战命中：对最大生命值超过10颗心的敌人造成%d点额外伤害", + "tooltip.adamantine.armor": "两件提供抗性提升 I；全套提供抗性提升 II", + "tooltip.aquarium.tool": "近战命中：对能在水下呼吸的敌人造成%d点额外伤害", + "tooltip.aquarium.armor": "在水中穿齐全套：水下呼吸、抗性提升，并移除挖掘疲劳", + "tooltip.coldiron.tool": "近战命中：对免疫火焰的敌人造成%d点额外伤害", + "tooltip.coldiron.armor": "全套：防火", + "tooltip.mithril.tool": "近战命中让亡灵生物失明并凋零，持续3秒", + "tooltip.mithril.armor": "全套：移除有害药水效果", + "tooltip.starsteel.tool": "手持时自我修复：每%d秒恢复1点耐久度", + "tooltip.starsteel.armor": "每件装备都让你跳得更高；两件及以上还会提升速度", "advancements.basemetals.aquarium_maker.title": "海洋合金", "advancements.basemetals.angel_of_death.title": "死亡天使", "advancements.basemetals.brass_maker.title": "黄铜", @@ -32,7 +32,7 @@ "advancements.basemetals.scuba_diver.title": "潜水员", "advancements.basemetals.steel_maker.title": "钢", "advancements.basemetals.this_is_new.title": "这是新的...", - "advancements.basemetals.aquarium_maker.description": "混合铜粉、锌粉和海晶砂粒晶体，并烧制海洋合金", + "advancements.basemetals.aquarium_maker.description": "将铜粉、锌粉和海晶石粉混合后熔炼，制成 Aquarium", "advancements.basemetals.angel_of_death.description": "穿上全套秘银装备，挥动秘银剑", "advancements.basemetals.brass_maker.description": "混合铜粉和锌粉，并烧制黄铜", "advancements.basemetals.bronze_maker.description": "混合铜粉和锡粉，并烧制青铜", @@ -40,15 +40,15 @@ "advancements.basemetals.cupronickel_maker.description": "混合铜粉和镍粉，并烧制白铜", "advancements.basemetals.demon_slayer.description": "穿上全套寒铁装备，挥舞寒铁剑", "advancements.basemetals.electrum_maker.description": "混合银粉和金粉，并烧制琥珀金", - "advancements.basemetals.geologist.description": "制作一把破裂锤", + "advancements.basemetals.geologist.description": "制作一把碎矿锤", "advancements.basemetals.invar_maker.description": "混合铁粉和镍粉，并烧制因瓦合金", "advancements.basemetals.juggernaut.description": "穿上全套艾德曼金属装备", "advancements.basemetals.metallurgy.description": "合成任何一种合金粉末", "advancements.basemetals.mithril_maker.description": "混合银粉、寒铁粉和液态汞，并烧制秘银", - "advancements.basemetals.pewter_maker.description": "混合???和???并烧制白镴", + "advancements.basemetals.pewter_maker.description": "将锡粉、铜粉和铅粉混合后熔炼，制成白镴", "advancements.basemetals.moon_boots.description": "穿上星钢靴子", "advancements.basemetals.scuba_diver.description": "穿上全套海洋合金装备，并在水下游泳", - "advancements.basemetals.steel_maker.description": "混合铁粉和炭粉，并烧制钢", + "advancements.basemetals.steel_maker.description": "将铁粉和煤粉混合后熔炼，制成钢", "advancements.basemetals.this_is_new.description": "冶炼出一种新金属", "item.basemetals.adamantine_axe": "艾德曼金属斧", "item.basemetals.aquarium_axe": "海洋合金斧", @@ -845,7 +845,7 @@ "fluid.basemetals.brass.name": "熔融黄铜", "fluid.basemetals.bronze.name": "熔融青铜", "fluid.basemetals.charcoal.name": "液化木炭", - "fluid.basemetals.coal.name": "液化煤炭", + "fluid.basemetals.coal.name": "液化煤", "fluid.basemetals.coldiron.name": "熔融寒铁", "fluid.basemetals.copper.name": "熔融铜", "fluid.basemetals.cupronickel.name": "熔融白铜", @@ -872,7 +872,7 @@ "block.basemetals.brass": "熔融黄铜", "block.basemetals.bronze": "熔融青铜", "block.basemetals.charcoal": "液化木炭", - "block.basemetals.coal": "液化煤炭", + "block.basemetals.coal": "液化煤", "block.basemetals.coldiron": "熔融寒铁", "block.basemetals.copper": "熔融铜", "block.basemetals.cupronickel": "熔融白铜", @@ -904,7 +904,7 @@ "item.bucket.brass": "熔融黄铜桶", "item.bucket.bronze": "熔融青铜桶", "item.bucket.charcoal": "液化木炭桶", - "item.bucket.coal": "液化煤炭桶", + "item.bucket.coal": "液化煤桶", "item.bucket.coldiron": "液化寒铁桶", "item.bucket.copper": "熔融铜桶", "item.bucket.cupronickel": "熔融白铜桶", @@ -1822,5 +1822,26 @@ "slurry.basemetals.dirty_starsteel": "Dirty Starsteel Slurry", "slurry.basemetals.clean_starsteel": "Clean Starsteel Slurry", "slurry.basemetals.dirty_zinc": "Dirty Zinc Slurry", - "slurry.basemetals.clean_zinc": "Clean Zinc Slurry" -} \ No newline at end of file + "slurry.basemetals.clean_zinc": "Clean Zinc Slurry", + "config.basemetals.title": "Base Metals 设置", + "config.basemetals.contentMode": "内容模式", + "config.basemetals.contentMode.tooltip": "选择用金属制作物品时的自由程度。矿石生成不受影响。", + "config.basemetals.content_mode.high_fantasy": "高奇幻", + "config.basemetals.content_mode.low_fantasy": "低奇幻", + "config.basemetals.content_mode.high_fantasy.description": "自由使用所有金属。全部配方、村民交易和宝箱物品都可获得。", + "config.basemetals.content_mode.low_fantasy.description": "保留奇幻金属，但限制每种材料能制作的物品。不提供 Base Metals 的弓、弩和钓鱼竿。", + "config.basemetals.specialEffects": "装备特殊效果", + "config.basemetals.specialEffects.tooltip": "让部分金属装备拥有特殊的盔甲和近战效果，例如穿齐 Aquarium 盔甲后可在水下呼吸。", + "config.basemetals.starsteelRegeneration": "星钢自我修复", + "config.basemetals.starsteelRegeneration.tooltip": "手持星钢装备时，每10秒恢复1点耐久度。盔甲不会自我修复。", + "config.basemetals.mercuryImmersionEffects": "汞中毒", + "config.basemetals.mercuryImmersionEffects.tooltip": "接触液态汞可能让你反胃。", + "config.basemetals.villagerTrades": "村民交易", + "config.basemetals.villagerTrades.tooltip": "让铁匠出售 Base Metals 的锭和装备。", + "config.basemetals.defaults": "默认设置", + "config.basemetals.undo": "撤销更改", + "config.basemetals.confirm.title": "更改内容模式？", + "config.basemetals.confirm.message": "重启 Minecraft 后即可使用新模式。你已有的物品仍可使用。加入服务器时，请选择与服务器相同的模式。", + "config.basemetals.restart": "更改模式后请重启 Minecraft。此选择对你的所有世界生效。矿石的生成位置可在 OreSpawn 中调整。", + "config.basemetals.connection.mismatch": "此服务器使用%s，你的游戏使用%s。请在 Mods → Base Metals → Config 中选择相同的模式，然后重启 Minecraft。" +} diff --git a/src/generated/resources/assets/basemetals/lang/zh_tw.json b/src/generated/resources/assets/basemetals/lang/zh_tw.json index 8199dc7f..10d02976 100644 --- a/src/generated/resources/assets/basemetals/lang/zh_tw.json +++ b/src/generated/resources/assets/basemetals/lang/zh_tw.json @@ -4,16 +4,16 @@ "itemGroup.basemetals.combat": "Base Metals 戰鬥", "itemGroup.basemetals.items": "Base Metals 物品", "itemGroup.basemetals.tools": "Base Metals 工具", - "tooltip.adamantine.tool": "對堅硬敵人造成外 %d 傷害", - "tooltip.adamantine.armor": "傷害減輕", - "tooltip.aquarium.tool": "對水中敵人造成額外 %d 傷害", - "tooltip.aquarium.armor": "套裝效果：水中呼吸", - "tooltip.coldiron.tool": "對火焰敵人造成額外 %d 傷害", - "tooltip.coldiron.armor": "套裝效果：火焰抗性", - "tooltip.mithril.tool": "對不死系致盲及凋零", - "tooltip.mithril.armor": "套裝效果：抗毒＆抗凋零", - "tooltip.starsteel.tool": "每 %d 秒修復 1 點耐久值", - "tooltip.starsteel.armor": "重量減輕", + "tooltip.adamantine.tool": "近戰命中：對最大生命值超過10顆心的敵人造成%d點額外傷害", + "tooltip.adamantine.armor": "兩件提供抗性提升 I；全套提供抗性提升 II", + "tooltip.aquarium.tool": "近戰命中：對能在水下呼吸的敵人造成%d點額外傷害", + "tooltip.aquarium.armor": "在水中穿齊全套：水下呼吸、抗性提升，並移除挖掘疲勞", + "tooltip.coldiron.tool": "近戰命中：對免疫火焰的敵人造成%d點額外傷害", + "tooltip.coldiron.armor": "全套：抗火", + "tooltip.mithril.tool": "近戰命中讓亡靈生物失明並凋零，持續3秒", + "tooltip.mithril.armor": "全套：移除有害藥水效果", + "tooltip.starsteel.tool": "手持時自我修復：每%d秒恢復1點耐久度", + "tooltip.starsteel.armor": "每件裝備都讓你跳得更高；兩件及以上還會提升速度", "advancements.basemetals.aquarium_maker.title": "海洋合金", "advancements.basemetals.angel_of_death.title": "死之天使", "advancements.basemetals.brass_maker.title": "黃銅", @@ -32,7 +32,7 @@ "advancements.basemetals.scuba_diver.title": "潛水員", "advancements.basemetals.steel_maker.title": "鋼", "advancements.basemetals.this_is_new.title": "這是新的…", - "advancements.basemetals.aquarium_maker.description": "混合銅、鋅粉末與海磷晶體，燒製成海洋合金", + "advancements.basemetals.aquarium_maker.description": "將銅粉、鋅粉和海磷石粉混合後熔煉，製成 Aquarium", "advancements.basemetals.angel_of_death.description": "穿上全套的秘銀盔甲、揮舞秘銀劍", "advancements.basemetals.brass_maker.description": "混合銅粉和鋅粉，燒製成黃銅", "advancements.basemetals.bronze_maker.description": "混合銅粉和錫粉，燒製成青銅", @@ -40,15 +40,15 @@ "advancements.basemetals.cupronickel_maker.description": "混合銅粉與鎳粉，燒製成白銅", "advancements.basemetals.demon_slayer.description": "穿上全套的寒鐵盔甲、揮舞寒鐵劍", "advancements.basemetals.electrum_maker.description": "混合銀粉與金粉，燒製成玫瑰金", - "advancements.basemetals.geologist.description": "以金屬磚打造一把鎚子", + "advancements.basemetals.geologist.description": "製作一把碎礦錘", "advancements.basemetals.invar_maker.description": "混合鐵粉與鎳粉，燒製成殷鋼", "advancements.basemetals.juggernaut.description": "穿上整套精金裝甲", "advancements.basemetals.metallurgy.description": "混合任一種合金粉末", "advancements.basemetals.mithril_maker.description": "混合銀、寒鐵粉末和水銀，並燒製秘銀", - "advancements.basemetals.pewter_maker.description": "混合 ??? 和 ??? 粉末來製造白鑞", + "advancements.basemetals.pewter_maker.description": "將錫粉、銅粉和鉛粉混合後熔煉，製成白鑞", "advancements.basemetals.moon_boots.description": "穿上一雙星鋼靴", "advancements.basemetals.scuba_diver.description": "穿上海洋合金套裝並潛入水中", - "advancements.basemetals.steel_maker.description": "混合鐵粉和碳粉，並燒製成鋼", + "advancements.basemetals.steel_maker.description": "將鐵粉和煤粉混合後熔煉，製成鋼", "advancements.basemetals.this_is_new.description": "冶煉出 Base Metals 模組中的新金屬", "item.basemetals.adamantine_axe": "精金斧", "item.basemetals.aquarium_axe": "海洋合金斧", @@ -876,7 +876,7 @@ "fluid.basemetals.brass.name": "熔融黃銅", "fluid.basemetals.bronze.name": "熔融青銅", "fluid.basemetals.charcoal.name": "液化木炭", - "fluid.basemetals.coal.name": "液化煤炭", + "fluid.basemetals.coal.name": "液化煤", "fluid.basemetals.coldiron.name": "熔融寒鐵", "fluid.basemetals.copper.name": "熔融銅", "fluid.basemetals.cupronickel.name": "熔融白銅", @@ -903,7 +903,7 @@ "block.basemetals.brass": "熔融黃銅", "block.basemetals.bronze": "熔融青銅", "block.basemetals.charcoal": "液化木炭", - "block.basemetals.coal": "液化煤炭", + "block.basemetals.coal": "液化煤", "block.basemetals.coldiron": "熔融寒鐵", "block.basemetals.copper": "熔融銅", "block.basemetals.cupronickel": "熔融白銅", @@ -934,8 +934,8 @@ "item.bucket.bismuth": "桶裝熔融鉍", "item.bucket.brass": "桶裝熔融黃銅", "item.bucket.bronze": "桶裝熔融青銅", - "item.bucket.charcoal": "桶裝液化木炭", - "item.bucket.coal": "桶裝液化煤炭", + "item.bucket.charcoal": "液化木炭桶", + "item.bucket.coal": "液化煤桶", "item.bucket.coldiron": "桶裝熔融寒鐵", "item.bucket.copper": "桶裝熔融銅", "item.bucket.cupronickel": "桶裝熔融白銅", @@ -1666,19 +1666,19 @@ "modifier.mmd-sparkly.name": "閃耀", "modifier.mmd-sparkly.desc": "Self-Repairing, shiny and sparkly stuff", "modifier.mmd-soft.name": "柔軟", - "modifier.mmd-soft.desc": "Not really good for tools that will see a lot of use as they\u0027ll wear out faster", + "modifier.mmd-soft.desc": "Not really good for tools that will see a lot of use as they'll wear out faster", "modifier.mmd-brittle.name": "脆弱", "modifier.mmd-brittle.desc": "As it breaks down it does more damage - but beware, it will hurt you as well!", "modifier.mmd-heavy.name": "沉重", - "modifier.mmd-heavy.desc": "This stuff is really, really dense - it\u0027ll tire you out faster to use any tools made from this", + "modifier.mmd-heavy.desc": "This stuff is really, really dense - it'll tire you out faster to use any tools made from this", "modifier.mmd-reactive.name": "高活性", "modifier.mmd-reactive.desc": "Reacts with water to wear out faster", "modifier.mmd-radioactive.name": "放射性", "modifier.mmd-radioactive.desc": "Dangerous to hold and use unless you can somehow shield yourself from the effects.", "modifier.toxic-modifier.name": "毒性", - "modifier.toxic-modifier.desc": "§oTOXIC AVENGER!§r\\nMercury and it\u0027s ethyl and methyl salts are extremely toxic and have neuro-degenerative effects.\\nAdding some to a weapon or tool gives it the ability to poison and temporarily blind your enemies.", + "modifier.toxic-modifier.desc": "§oTOXIC AVENGER!§r\\nMercury and it's ethyl and methyl salts are extremely toxic and have neuro-degenerative effects.\\nAdding some to a weapon or tool gives it the ability to poison and temporarily blind your enemies.", "modifier.lead-plated.name": "鉛板", - "modifier.lead-plated.desc": "§oSafety First§r\\nIf you\u0027ve got some Plutonium or Uranium around and think it\u0027d be great for a weapon, don\u0027t forget to add some shielding.\\nA nice lead plate will stop the deadly radiation from affection you while still letting it harm your enemies.", + "modifier.lead-plated.desc": "§oSafety First§r\\nIf you've got some Plutonium or Uranium around and think it'd be great for a weapon, don't forget to add some shielding.\\nA nice lead plate will stop the deadly radiation from affection you while still letting it harm your enemies.", "block.basemetals.steel_anvil.intact": "鋼砧", "block.basemetals.steel_anvil.slightlyDamaged": "輕微耗損的鋼砧", "block.basemetals.steel_anvil.veryDamaged": "嚴重耗損的鋼砧", @@ -1856,5 +1856,26 @@ "slurry.basemetals.dirty_starsteel": "Dirty Starsteel Slurry", "slurry.basemetals.clean_starsteel": "Clean Starsteel Slurry", "slurry.basemetals.dirty_zinc": "Dirty Zinc Slurry", - "slurry.basemetals.clean_zinc": "Clean Zinc Slurry" -} \ No newline at end of file + "slurry.basemetals.clean_zinc": "Clean Zinc Slurry", + "config.basemetals.title": "Base Metals 設定", + "config.basemetals.contentMode": "內容模式", + "config.basemetals.contentMode.tooltip": "選擇用金屬製作物品時的自由程度。礦石生成不受影響。", + "config.basemetals.content_mode.high_fantasy": "高奇幻", + "config.basemetals.content_mode.low_fantasy": "低奇幻", + "config.basemetals.content_mode.high_fantasy.description": "自由使用所有金屬。全部配方、村民交易和寶箱物品都可取得。", + "config.basemetals.content_mode.low_fantasy.description": "保留奇幻金屬，但限制每種材料能製作的物品。不提供 Base Metals 的弓、弩和釣竿。", + "config.basemetals.specialEffects": "裝備特殊效果", + "config.basemetals.specialEffects.tooltip": "讓部分金屬裝備擁有特殊的盔甲和近戰效果，例如穿齊 Aquarium 盔甲後可在水下呼吸。", + "config.basemetals.starsteelRegeneration": "星鋼自我修復", + "config.basemetals.starsteelRegeneration.tooltip": "手持星鋼裝備時，每10秒恢復1點耐久度。盔甲不會自我修復。", + "config.basemetals.mercuryImmersionEffects": "汞中毒", + "config.basemetals.mercuryImmersionEffects.tooltip": "接觸液態汞可能讓你噁心。", + "config.basemetals.villagerTrades": "村民交易", + "config.basemetals.villagerTrades.tooltip": "讓鐵匠出售 Base Metals 的錠和裝備。", + "config.basemetals.defaults": "預設設定", + "config.basemetals.undo": "復原變更", + "config.basemetals.confirm.title": "變更內容模式？", + "config.basemetals.confirm.message": "重新啟動 Minecraft 後即可使用新模式。你已有的物品仍可使用。加入伺服器時，請選擇與伺服器相同的模式。", + "config.basemetals.restart": "變更模式後請重新啟動 Minecraft。此選擇對你的所有世界生效。礦石的生成位置可在 OreSpawn 中調整。", + "config.basemetals.connection.mismatch": "此伺服器使用%s，你的遊戲使用%s。請在 Mods → Base Metals → Config 中選擇相同的模式，然後重新啟動 Minecraft。" +} diff --git a/src/generated/resources/data/basemetals/advancements/recipes/activator_rail.json b/src/generated/resources/data/basemetals/advancements/recipes/activator_rail.json index 4f965e67..3108d71a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/activator_rail.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/activator_rail.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_anvil.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_anvil.json index 9255fd90..e99dd94f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_anvil.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_anvil.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_arrow.json index 98edbe4e..13da1663 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_arrow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_axe.json index 57312b3f..88e8229f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_axe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bars.json index df8238bf..66c27dfb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bars.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bars_2.json index 78793d59..59bfefab 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bars_2.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_block.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_block.json index 49295556..81dcba8a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_block.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_block_ingot.json index 91d95f92..8dcfe9ce 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_block_ingot.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bolt.json index 9a492ff6..edce7831 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bolt.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_boots.json index 186d0c09..26478f19 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_boots.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bow.json index 42c80621..e18d334f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_bow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_button.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_button.json index 029febd7..69c1e68f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_button.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_chestplate.json index 377f5e0a..e241fe1b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_chestplate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_crackhammer.json index 8ef7d4d0..b3ed84e6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_crossbow.json index d8ec45ca..c3dab55d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_crossbow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_door.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_door.json index 843bb0e5..61b77b1c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_door.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_fishingrod.json index 49ec44fd..4aa1af6e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_fishingrod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_gear.json index 58119415..aad92386 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_gear.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_helmet.json index 8ce41697..e281bb22 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_helmet.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_hoe.json index cc9f7f95..450c3280 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_hoe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_horsearmor.json index 79ce8d37..d55a01d3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_horsearmor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_ingot_from_nuggets.json index 5287fa1d..e709fc39 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_ingot_from_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_leggings.json index 11d64aa3..892c876a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_leggings.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_lever.json index 4646034d..66f973de 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_lever.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_nuggets.json index 0fd78583..28805101 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_pickaxe.json index 05e5f46a..11a24cb3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_pickaxe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_plate.json index 4f9c9d43..4f6fb736 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_powder_from_small.json index 710b15f3..e95d5df5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_pressure_plate.json index a382bb79..722eda6c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_pressure_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_rod.json index f1c2df35..7c5fc3d1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_rod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_scythe.json index b8973ac7..2d93dcdd 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_shears.json index 2c13d863..82434478 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_shears.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_shield.json index 9d24c06a..61d0c073 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_shield.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_shovel.json index dc94a05f..0e684357 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_shovel.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_slab.json index 42b912f4..560d5ef8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_slab.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_smallpowder.json index 618173cd..c7ce631e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_stairs.json index 9c24bd87..b71a7ff0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_stairs.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_sword.json index 149e291c..c925099a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_sword.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_trapdoor.json index 27770af2..1fc4601d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_trapdoor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_wall.json index 0cc7046f..45b79297 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/adamantine_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/adamantine_wall.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/adamantine" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_arrow.json index 98188105..01d07391 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_arrow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_axe.json index 7db4b0f1..cf765435 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_axe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_bars.json index 7c9172b6..d881c567 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_bars.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_bars_2.json index 08b50d90..9aef9658 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_bars_2.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_block.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_block.json index 670ae358..39d165cb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_block.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_block_ingot.json index fbe34200..2ddc5097 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_block_ingot.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_bolt.json index 282b969a..52e6aa03 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_bolt.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_boots.json index 37671e7d..6a88bb1d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_boots.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_bow.json index 080e131e..3549e04b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_bow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_button.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_button.json index 150d8ce8..7132b9b5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_button.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_chestplate.json index 96e2afd6..983bf9c7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_chestplate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_crackhammer.json index aa63de10..93a40992 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_crossbow.json index 845330c8..e30d4c0f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_crossbow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_door.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_door.json index 98c05b7d..e97893b6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_door.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_fishingrod.json index bfd1bdb2..07c90218 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_fishingrod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_gear.json index 4ad88a95..160f9662 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_gear.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_helmet.json index dfa912af..ae5194c3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_helmet.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_hoe.json index 6726f085..2ecd06f9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_hoe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_horsearmor.json index 09d10a10..6bcf6ec5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_horsearmor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_ingot_from_nuggets.json index b5a28c4e..f9426865 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_ingot_from_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_leggings.json index b8e07d52..8a295fe1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_leggings.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_lever.json index 7862ed51..fae21f8e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_lever.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_nuggets.json index 7059b72b..b5ff5014 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_pickaxe.json index 2d88c2a6..89b263af 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_pickaxe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_plate.json index 5f5ca794..388edb0e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_powder_from_small.json index 3b32a901..6b163878 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_pressure_plate.json index 053cad9c..bd129ffe 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_pressure_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_rod.json index a7ce4aa3..c8d4b985 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_rod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_scythe.json index b633af42..6c88aa0d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_shears.json index 03f022bf..f52ef6e3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_shears.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_shield.json index 0d5d286a..a7c1dd0c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_shield.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_shovel.json index c43cfa5c..a087fcf1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_shovel.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_slab.json index 08f1b292..f066179a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_slab.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_smallpowder.json index 335bf338..0c455b6b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_stairs.json index 3e62e494..ead4c53c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_stairs.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_sword.json index 9153b83c..df2439b5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_sword.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_trapdoor.json index 45c2e52a..7e844e48 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_trapdoor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/antimony_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/antimony_wall.json index cdc859da..9c477a81 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/antimony_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/antimony_wall.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/antimony" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_arrow.json index b22479fa..249e2ccf 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_arrow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_axe.json index 3f686b4d..3ee4b0d9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_axe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bars.json index 3a9c9e1e..fd5c9aaf 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bars.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bars_2.json index a91518c3..17865d80 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bars_2.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_blend.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_blend.json index 33f63187..35322fc9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_blend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_blend.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -40,6 +50,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2", diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_blend_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_blend_from_small.json index a21f86ed..70c89cb1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_blend_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_blend_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_block.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_block.json index 9cb7d2fc..c4801008 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_block.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_block_ingot.json index c26e90af..bc34f15e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_block_ingot.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bolt.json index f5a7d0b6..f6fd2ecb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bolt.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_boots.json index 1190fad1..a0d8f737 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_boots.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bow.json index 27b7d3bd..15c0d98e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_bow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_button.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_button.json index 404241c4..f9616874 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_button.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_chestplate.json index d30a3944..b26fe049 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_chestplate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_crackhammer.json index 2325c6a4..f85c6a63 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_crossbow.json index 5730efb3..22151fe8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_crossbow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_door.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_door.json index 5277f35d..bb6c6455 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_door.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_fishingrod.json index b52c3ea6..704b2923 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_fishingrod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_gear.json index 63aa5bfb..4ebae9d7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_gear.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_helmet.json index 83a37593..84fb30b9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_helmet.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_hoe.json index 142bb606..d0842a13 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_hoe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_horsearmor.json index d9c46ac8..ab8d757d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_horsearmor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_ingot_from_nuggets.json index ae899426..d82d4add 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_ingot_from_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_leggings.json index d2eae97d..f2036568 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_leggings.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_lever.json index ed8be102..242c5d3a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_lever.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_nuggets.json index fb02fff5..1e7ffd5b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_pickaxe.json index 424f5f32..e88b0be0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_pickaxe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_plate.json index e029675e..55a978bd 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_powder_from_small.json index 4e6f4dff..7db595ae 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_pressure_plate.json index 1f224ec5..0c1c13c3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_pressure_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_rod.json index 511fbfd5..70e15de8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_rod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_scythe.json index df6f14f3..c74a2600 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_shears.json index c527f973..7db41146 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_shears.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_shield.json index 28b47007..141dbb92 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_shield.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_shovel.json index a03e5d25..6a4f4a92 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_shovel.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_slab.json index 5e6e8925..19c44c29 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_slab.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_smallblend.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_smallblend.json index 3f5851e9..1a57c47e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_smallblend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_smallblend.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_smallpowder.json index e1b6a6c3..23514e36 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_stairs.json index 4ccef756..1f62afeb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_stairs.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_sword.json index d37a5110..1650fda3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_sword.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_trapdoor.json index 9d9751c6..08aece83 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_trapdoor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_wall.json index 6ddc1979..9576cf45 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/aquarium_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/aquarium_wall.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/aquarium" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_arrow.json index 63bf7307..027e44fc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_arrow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_axe.json index 5626267f..4c2ee3a0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_axe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bars.json index 7a65621b..10494794 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bars.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bars_2.json index 2d3f7f1d..cbc24c3d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bars_2.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_block.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_block.json index b1efd3d9..826af4b8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_block.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_block_ingot.json index 824cb218..78769387 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_block_ingot.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bolt.json index 9779f9d9..964f8f3b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bolt.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_boots.json index a2c81a9f..f2acb5de 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_boots.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bow.json index 6b374052..7486b22d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_bow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_button.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_button.json index fcbe2f2f..336a8ee2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_button.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_chestplate.json index cf3b84e2..6b0dd28c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_chestplate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_crackhammer.json index a7ed422b..b2c87103 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_crossbow.json index 5ed0400c..c59653a3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_crossbow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_door.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_door.json index c36bde31..0502d543 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_door.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_fishingrod.json index 911ee644..fe6b0aae 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_fishingrod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_gear.json index a442eff3..b3a7d260 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_gear.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_helmet.json index e2f7b0f2..758a0294 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_helmet.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_hoe.json index ad2fac3d..acdd1d55 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_hoe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_horsearmor.json index bf475cbe..86736e56 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_horsearmor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_ingot_from_nuggets.json index fe21bb55..4f823f05 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_ingot_from_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_leggings.json index 66053d5c..e3dd3c90 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_leggings.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_lever.json index 0f5d1bdd..da83f90d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_lever.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_nuggets.json index 2dbc3b48..057fb10f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_pickaxe.json index e3d9fca5..dd9d41b9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_pickaxe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_plate.json index 0d9cff60..9ca31cdd 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_powder_from_small.json index b5058f84..e5c4ee05 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_pressure_plate.json index e1a9b032..cd6826c2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_pressure_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_rod.json index 1f447fb7..0c74e259 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_rod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_scythe.json index c31a5142..36a42e11 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_shears.json index c5f1474b..7b78715d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_shears.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_shield.json index 122edcf9..a02a8964 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_shield.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_shovel.json index 65b58ae3..9bcc2d61 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_shovel.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_slab.json index de01a69c..b6ab0ff0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_slab.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_smallpowder.json index 22a8e91d..d2c1ea60 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_stairs.json index 1d367102..a290c8f4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_stairs.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_sword.json index 8abf8632..27a0d5ac 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_sword.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_trapdoor.json index d6fcfa2b..eaf82019 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_trapdoor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_wall.json index e7e7a95e..b207c716 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bismuth_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bismuth_wall.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bismuth" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_arrow.json index f94484e9..10be3326 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_arrow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_axe.json index c3e87efd..0fc013fd 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_axe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_bars.json index 53e0ca69..e3d00d88 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_bars.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_bars_2.json index b4971a14..cc803c73 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_bars_2.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_blend.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_blend.json index 4f413479..21be12ff 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_blend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_blend.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_blend_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_blend_from_small.json index b04814fd..9c50374d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_blend_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_blend_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_block.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_block.json index fdf24b9f..55f7a908 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_block.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_block_ingot.json index 23df420e..f87b53f3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_block_ingot.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_bolt.json index 3c1273bc..108679a4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_bolt.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_boots.json index e7f716f8..6be8270e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_boots.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_bow.json index fa3dd4ad..7386f651 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_bow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_button.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_button.json index 15367e09..6dc6e977 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_button.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_chestplate.json index 35287112..03c494ca 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_chestplate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_crackhammer.json index 1f86de74..44cf687f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_crossbow.json index 90af1a90..82377a79 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_crossbow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_door.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_door.json index d3dbed01..cfd7264a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_door.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_fishingrod.json index ccc74b4a..f065d3f6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_fishingrod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_gear.json index a3809c01..5cb6d6d0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_gear.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_helmet.json index 8bb22143..58110f7f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_helmet.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_hoe.json index 7827d072..bb414135 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_hoe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_horsearmor.json index 6a098136..46f864f4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_horsearmor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_ingot_from_nuggets.json index 9a341fcb..8d53374c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_ingot_from_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_leggings.json index 456009f7..ec665a99 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_leggings.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_lever.json index 3b089d3b..cafccf79 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_lever.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_nuggets.json index 83961101..82bfa482 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_pickaxe.json index 6314bd11..7fab674c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_pickaxe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_plate.json index 5cb46985..15e22956 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_powder_from_small.json index d8b08b28..1916dfbf 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_pressure_plate.json index df93e3cc..5d0bdb67 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_pressure_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_rod.json index 75911a6f..8812bde4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_rod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_scythe.json index 692094b3..7ad92fd9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_shears.json index e1424c54..1f571454 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_shears.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_shield.json index 5b9a0d54..3665d5f9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_shield.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_shovel.json index a478f13f..39d440f6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_shovel.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_slab.json index 4081e702..72616eb5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_slab.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_smallblend.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_smallblend.json index fb206035..ae565d70 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_smallblend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_smallblend.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_smallpowder.json index 0af4a207..23f3f945 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_stairs.json index 6d8a2ee0..18810512 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_stairs.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_sword.json index 85adba2c..98716432 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_sword.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_trapdoor.json index 93c17f20..1a9c1d89 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_trapdoor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/brass_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/brass_wall.json index 08e817f2..e179c835 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/brass_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/brass_wall.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/brass" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_arrow.json index 3070fe47..d125c988 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_arrow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_axe.json index e160727d..2dda6df1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_axe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_bars.json index 1d7d7731..77f1ac64 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_bars.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_bars_2.json index a9eff805..e7969af9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_bars_2.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_blend.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_blend.json index 8c0bc020..6411f983 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_blend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_blend.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_blend_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_blend_from_small.json index 705c85a3..4c7c3f6a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_blend_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_blend_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_block.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_block.json index 74bd7958..9f189ae4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_block.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_block_ingot.json index 12b53136..a0645261 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_block_ingot.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_bolt.json index 0c6bcc50..12dd08a0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_bolt.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_boots.json index d468d7ca..3853c4b3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_boots.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_bow.json index 2e3aa45b..617b8a1f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_bow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_button.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_button.json index e759add1..44e8f956 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_button.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_chestplate.json index fbfd1332..26d025cb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_chestplate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_crackhammer.json index a95d4258..1dd5566c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_crossbow.json index f51c60e4..ff8c99e8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_crossbow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_door.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_door.json index a1897da7..8b17c36f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_door.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_fishingrod.json index a696eb0d..cda7e120 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_fishingrod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_gear.json index d7053f8b..73e530a9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_gear.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_helmet.json index 51e0bd44..9ca37823 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_helmet.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_hoe.json index 49a4ff87..c6eff658 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_hoe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_horsearmor.json index fb679eed..de680b34 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_horsearmor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_ingot_from_nuggets.json index d5a5f1df..6d8c9d34 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_ingot_from_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_leggings.json index 2456108c..bd1cab82 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_leggings.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_lever.json index 9ef9ae70..eb84ef88 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_lever.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_nuggets.json index 9fe6b9a1..a192dc5d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_pickaxe.json index 4940d863..eb793ff9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_pickaxe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_plate.json index e3519105..dfcdd1c6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_powder_from_small.json index 07a245e3..fabac91f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_pressure_plate.json index 6e83cb40..f4518613 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_pressure_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_rod.json index 668db2a8..c79aec89 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_rod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_scythe.json index 38212013..6dd60d15 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_shears.json index 08181171..7ed393a2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_shears.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_shield.json index 6f65f2a8..d9e06319 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_shield.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_shovel.json index c2c19f63..62fb75b9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_shovel.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_slab.json index 3e653399..c769592f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_slab.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_smallblend.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_smallblend.json index 704fea98..5e981e1e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_smallblend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_smallblend.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_smallpowder.json index b47f53a8..420f9fe6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_stairs.json index 2f6438f7..398a1ddb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_stairs.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_sword.json index 7f48d23c..d58f3448 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_sword.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_trapdoor.json index 0bbc4a10..4c5eff08 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_trapdoor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/bronze_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/bronze_wall.json index f8738f38..9e2ae213 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/bronze_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/bronze_wall.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/bronze" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/charcoal_block.json b/src/generated/resources/data/basemetals/advancements/recipes/charcoal_block.json index dcb95461..f0302026 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/charcoal_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/charcoal_block.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:charcoal" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/charcoal_block_dust.json b/src/generated/resources/data/basemetals/advancements/recipes/charcoal_block_dust.json index bceeae75..1edb98be 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/charcoal_block_dust.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/charcoal_block_dust.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:charcoal" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/charcoal_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/charcoal_ingot.json index ccf38902..6b35285a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/charcoal_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/charcoal_ingot.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:charcoal" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/charcoal_nugget.json b/src/generated/resources/data/basemetals/advancements/recipes/charcoal_nugget.json index 4e5f676a..fb59b165 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/charcoal_nugget.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/charcoal_nugget.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:charcoal" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/charcoal_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/charcoal_powder_from_small.json index 45f14c25..6df61adc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/charcoal_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/charcoal_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:charcoal" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/charcoal_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/charcoal_smallpowder.json index aad1500a..22d720a2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/charcoal_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/charcoal_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:charcoal" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coal_block_dust.json b/src/generated/resources/data/basemetals/advancements/recipes/coal_block_dust.json index 8875eddf..3c38a0be 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coal_block_dust.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coal_block_dust.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:coal" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coal_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/coal_ingot.json index bc5b0c7c..1553238d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coal_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coal_ingot.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:coal" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coal_nugget.json b/src/generated/resources/data/basemetals/advancements/recipes/coal_nugget.json index 0886c491..192b952a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coal_nugget.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coal_nugget.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:coal" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coal_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/coal_powder_from_small.json index 3b9c49d5..a1698b7e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coal_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coal_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:coal" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coal_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/coal_smallpowder.json index 80b51af2..2244319d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coal_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coal_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:coal" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_arrow.json index 18f45987..2cfae29f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_arrow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_axe.json index fc94cced..82a6c774 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_axe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bars.json index 1ef5d3eb..a29bf383 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bars.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bars_2.json index 0d600943..cd8f0c65 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bars_2.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_block.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_block.json index 41ef0341..cb9501ce 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_block.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_block_ingot.json index a4ac7446..bf42496d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_block_ingot.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bolt.json index df71cf16..285b68fb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bolt.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_boots.json index 8f340bfd..9a2be77a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_boots.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bow.json index 0728bd6f..2fb9a198 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_bow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_button.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_button.json index cfb9abcf..9a9bf575 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_button.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_chestplate.json index bdff9f0f..2d8f2587 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_chestplate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_crackhammer.json index d16fcad5..c79130ac 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_crossbow.json index 6e612dd1..35ff3628 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_crossbow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_door.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_door.json index 011b3d24..dbce6aca 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_door.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_fishingrod.json index 3ffe8bd8..634125c1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_fishingrod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_gear.json index 0081e601..507745d1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_gear.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_helmet.json index f20d0398..6148b8e5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_helmet.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_hoe.json index 46e921d9..268d3575 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_hoe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_horsearmor.json index d6ae1a55..816725e8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_horsearmor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_ingot_from_nuggets.json index e7e4e7c8..ff5c8651 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_ingot_from_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_leggings.json index f2a208d9..4c794dba 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_leggings.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_lever.json index ab1cc804..5fd65b3c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_lever.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_nuggets.json index 0a2eb845..09a6c23f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_pickaxe.json index 5b6808e6..ab6967ed 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_pickaxe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_plate.json index afbceafd..9c62c9a3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_powder_from_small.json index ef1c5e64..cf32b561 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_pressure_plate.json index 2c0e637f..407ce575 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_pressure_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_rod.json index 9e6b80e6..892c6c4e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_rod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_scythe.json index 216819cd..cdca9cb8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_shears.json index ddecf9fe..e852b4a1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_shears.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_shield.json index 5b1a6904..f14dfc9e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_shield.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_shovel.json index 9c88ff70..b8ebd461 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_shovel.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_slab.json index bbbaf524..5c44f7ce 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_slab.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_smallpowder.json index d9fb98d3..1333d3ad 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_stairs.json index e5d0c63b..1004b407 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_stairs.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_sword.json index 02caf240..e80b99b8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_sword.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_trapdoor.json index d6a9df46..1feec504 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_trapdoor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_wall.json index d34c1ec1..00cd25b3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/coldiron_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/coldiron_wall.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/coldiron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_arrow.json index 21ac3a1d..79a08055 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_arrow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_axe.json index ec77966f..f6e788bc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_axe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_bars.json index 8b997169..6366507f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_bars.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_bars_2.json index 8778f26c..dd95e0eb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_bars_2.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_block.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_block.json index 622a8325..502957c2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_block.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_block_ingot.json index 720c47ed..982eda65 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_block_ingot.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_bolt.json index b3f25897..29520165 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_bolt.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_boots.json index 4483252d..9ae9b733 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_boots.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_bow.json index a26b5ae2..aea6009b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_bow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_button.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_button.json index d68216c4..b9618dab 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_button.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_chestplate.json index 34b66065..92dcbc2e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_chestplate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_crackhammer.json index 1f9bed47..44fa51fa 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_crossbow.json index c847be5f..90ceacab 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_crossbow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_door.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_door.json index 063bb27c..47e8c90d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_door.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_fishingrod.json index 1f032d3d..b94a61b1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_fishingrod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_gear.json index 243d515c..59c78663 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_gear.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_helmet.json index a6cac2fc..54d4fb3d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_helmet.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_hoe.json index c07e9336..cf17e3c5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_hoe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_horsearmor.json index 0592e51f..8ad6dfd5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_horsearmor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_ingot_from_nuggets.json index 09762315..d425cc69 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_ingot_from_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_leggings.json index 5c88f802..1223e5a4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_leggings.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_lever.json index ac359f1f..1ed159ed 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_lever.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_nuggets.json index 87c35c63..fb23050a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_pickaxe.json index 249392b2..d65a18b5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_pickaxe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_plate.json index 96450aa9..d7b658b9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_powder_from_small.json index 5192c839..c856eb5d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_pressure_plate.json index 122dcfb2..1f524ab2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_pressure_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_rod.json index f992e2e7..bd61ba1f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_rod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_scythe.json index fff2de85..0f78c861 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_shears.json index 894cad19..401f6ef3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_shears.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_shield.json index 106ddee2..0cc1eb90 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_shield.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_shovel.json index 97c9b32a..0debd120 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_shovel.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_slab.json index d38efac8..df78b6f4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_slab.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_smallpowder.json index 284a0bd4..fc57db93 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_stairs.json index 696ebc6f..2b87ce51 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_stairs.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_sword.json index ac2e12f9..5199f818 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_sword.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_trapdoor.json index 217afd97..88984728 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_trapdoor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/copper_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/copper_wall.json index a16c21ca..a8442402 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/copper_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/copper_wall.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/copper" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_arrow.json index a9a7727d..14d2f563 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_arrow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_axe.json index 944fe3de..624d0846 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_axe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bars.json index f65d72e5..6ca73b24 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bars.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bars_2.json index 7cf721d7..336fc9aa 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bars_2.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_blend.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_blend.json index 8bc1dbab..b36058bc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_blend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_blend.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_blend_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_blend_from_small.json index ac38f577..b942765b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_blend_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_blend_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_block.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_block.json index e67c8b98..e3887aba 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_block.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_block_ingot.json index 0efd5881..69a1e6e9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_block_ingot.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bolt.json index c78fb9a4..f4dc2a54 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bolt.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_boots.json index a03d3333..79d74fc2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_boots.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bow.json index 6ab93592..7ef03e6a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_bow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_button.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_button.json index 651a5080..9a0c6af8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_button.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_chestplate.json index 4d38e676..89cf6ccb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_chestplate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_crackhammer.json index 361f98cb..b85b6d2e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_crossbow.json index 563b4573..ae088239 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_crossbow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_door.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_door.json index 6ce2c819..02abc760 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_door.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_fishingrod.json index 2d1a5010..0e1365ce 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_fishingrod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_gear.json index 8f57984f..4af102ac 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_gear.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_helmet.json index 28dcc133..608b1894 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_helmet.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_hoe.json index c905523a..0932b2e8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_hoe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_horsearmor.json index 94643631..3987a3fc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_horsearmor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_ingot_from_nuggets.json index 1db138a5..0778a012 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_ingot_from_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_leggings.json index 47e55259..6a3e8799 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_leggings.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_lever.json index 776d9ad6..b6e3e51c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_lever.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_nuggets.json index 2f7b783b..16e219f6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_pickaxe.json index 46dc49b6..aabc6431 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_pickaxe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_plate.json index 1c9b2de3..321a20c1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_powder_from_small.json index 583c7a31..3d064d1c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_pressure_plate.json index d9634a8b..04b3eb64 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_pressure_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_rod.json index 5ae3c89a..ea7de15b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_rod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_scythe.json index acf6a4eb..307a1684 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shears.json index efc67643..776118af 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shears.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shield.json index 8e436caa..367df461 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shield.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shovel.json index 0d82e61a..b2b6ec5b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_shovel.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_slab.json index 298d9927..c45a80c2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_slab.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_smallblend.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_smallblend.json index 7c6a2582..e5a3cb89 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_smallblend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_smallblend.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_smallpowder.json index 2c95de34..55e3448c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_stairs.json index fee2634f..2276e288 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_stairs.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_sword.json index 9053fbe4..02f19ef9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_sword.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_trapdoor.json index a806f61d..6a73d235 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_trapdoor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_wall.json index 0046efc5..813f93c0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/cupronickel_wall.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/cupronickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/detector_rail.json b/src/generated/resources/data/basemetals/advancements/recipes/detector_rail.json index aa6a76cd..402bf3a8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/detector_rail.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/detector_rail.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_arrow.json index 17f5bbba..94ecc5b5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_arrow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/diamond" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_bars.json index bbd934b9..e4e70bcd 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_bars.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/diamond" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_bars_2.json index db4fbfb4..0af5b789 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_bars_2.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/diamond" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_bolt.json index a92c15a0..9fdcf938 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_bolt.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/diamond" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_bow.json index bbd7dac0..8b731a77 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_bow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/diamond" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_button.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_button.json index d8678536..304f5879 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_button.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/diamond" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_crackhammer.json index 645116b2..98a18278 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/diamond" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_crossbow.json index c876dec0..331e687a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_crossbow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/diamond" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_door.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_door.json index f8d6285e..b522f30d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_door.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/diamond" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_fishingrod.json index 2ed811ae..21fcaf05 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_fishingrod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/diamond" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_gear.json index e76d13c9..4c836fcf 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_gear.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/diamond" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_lever.json index d05c2660..9f9f454b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_lever.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/diamond" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_powder_from_small.json index 39ad8981..7e6f37d2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/diamond" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_pressure_plate.json index a4809623..fb77860f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_pressure_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/diamond" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_rod.json index fffd6cf2..4f63ad70 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_rod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/diamond" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_scythe.json index ea3148d9..57e72ab8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/diamond" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_shears.json index f2ebaf83..6ef4ced1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_shears.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/diamond" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_shield.json index e03d7f6b..bb5f1ee2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_shield.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/diamond" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_slab.json index 9f224ef0..c3037e81 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_slab.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/diamond" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_smallpowder.json index 18bfc871..ac198317 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/diamond" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_stairs.json index ac1f73a9..591f734e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_stairs.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/diamond" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_trapdoor.json index ff0cfe2a..a878b407 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_trapdoor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/diamond" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/diamond_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/diamond_wall.json index b4d20e36..f3d99037 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/diamond_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/diamond_wall.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/diamond" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_arrow.json index 50616ea3..b59a6da8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_arrow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_axe.json index 0c4fcca9..8ec8c6db 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_axe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_bars.json index dd43deaf..a465132d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_bars.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_bars_2.json index ba173b9b..a78c29d2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_bars_2.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_blend.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_blend.json index 88b8bd7c..4f556fef 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_blend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_blend.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_blend_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_blend_from_small.json index c9cddd82..fd197e8c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_blend_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_blend_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_block.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_block.json index 1ec0c3ba..367aba58 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_block.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_block_ingot.json index a0f3cb82..d75294fc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_block_ingot.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_bolt.json index 8c293ccd..eae9bbce 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_bolt.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_boots.json index f6d05db4..0c4914c2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_boots.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_bow.json index 9557c1ef..d1a784c1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_bow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_button.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_button.json index e3f6d023..d7961cc7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_button.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_chestplate.json index 4c6d7577..e581c6a9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_chestplate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_crackhammer.json index 46bd3398..0f8bdf44 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_crossbow.json index 92352bee..46e1c181 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_crossbow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_door.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_door.json index c6f72c3d..7cca0cec 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_door.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_fishingrod.json index 724b9380..d282c684 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_fishingrod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_gear.json index bce71333..5b024a8e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_gear.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_helmet.json index dae3834d..39b13b4d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_helmet.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_hoe.json index af06ec24..05706dc7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_hoe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_horsearmor.json index d270d038..a6d3b216 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_horsearmor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_ingot_from_nuggets.json index 3ff37522..ad8e7e98 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_ingot_from_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_leggings.json index 6b67c97c..a2b54136 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_leggings.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_lever.json index d220073f..31cb512b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_lever.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_nuggets.json index 490d5f65..06bd009b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_pickaxe.json index d0b94fae..1f5922e0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_pickaxe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_plate.json index 8ca00ec8..d5330cb8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_powder_from_small.json index 76529e6d..aaf09472 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_pressure_plate.json index e03106a4..91f5b76a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_pressure_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_rod.json index 4fdc615e..f9fd6532 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_rod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_scythe.json index 93335ff0..45ce5818 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_shears.json index a47970c0..7c2bc187 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_shears.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_shield.json index e2e25183..175b0f50 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_shield.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_shovel.json index 52261789..f49ff706 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_shovel.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_slab.json index d45fe7e0..516cf098 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_slab.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_smallblend.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_smallblend.json index e1b22cb8..6123d577 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_smallblend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_smallblend.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_smallpowder.json index acd26a70..37ce6d17 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_stairs.json index a043cbe9..c43b3dd4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_stairs.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_sword.json index 83ed2279..3c10397c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_sword.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_trapdoor.json index 2a380ba7..86f4d283 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_trapdoor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/electrum_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/electrum_wall.json index f7321056..b4590218 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/electrum_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/electrum_wall.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/electrum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_arrow.json index 17a96d8e..0e428d26 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_arrow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_axe.json index 4ac94615..5b80ecb8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_axe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_bars.json index d607044c..04f57b89 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_bars.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_bars_2.json index 78a109fd..fdadf481 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_bars_2.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_bolt.json index 788a3dc5..0bdbdaf1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_bolt.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_boots.json index e195a8d2..96dc4ab5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_boots.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_bow.json index 236c8e2a..0bbc4ffc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_bow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_button.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_button.json index 6c22712e..54824e4e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_button.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_chestplate.json index a3f9d6a5..79b74deb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_chestplate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_crackhammer.json index 63bf2119..0ee0d436 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_crossbow.json index 581cc803..8592cd75 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_crossbow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_door.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_door.json index 53dc4ae3..5ece9c45 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_door.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_fishingrod.json index c722626a..63a1808f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_fishingrod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_gear.json index db6137bd..684bb10c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_gear.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_helmet.json index d838cbec..5ce5545e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_helmet.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_hoe.json index cea4de24..b0aee3d3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_hoe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_horsearmor.json index 47a94da3..8c1a3622 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_horsearmor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_leggings.json index f8626db6..b71e4368 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_leggings.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_lever.json index e3429f17..f87e9709 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_lever.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_pickaxe.json index 2715c0a0..36d9b8f8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_pickaxe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_powder_from_small.json index cc6c4e6e..d610a7a6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_pressure_plate.json index 3a8998c5..b9e79a6d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_pressure_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_rod.json index ad4a1bb9..1b3fecc9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_rod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_scythe.json index af837e7c..9e7f82c0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_shears.json index 4b9aedd1..9a6ccbd6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_shears.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_shield.json index b8cb30af..417fdc4a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_shield.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_shovel.json index 8923bd13..ef47759e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_shovel.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_slab.json index 3dc5da08..a71cbdb7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_slab.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_smallpowder.json index ad86dd7e..40f05896 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_stairs.json index 5a86b0a3..d1621e17 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_stairs.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_sword.json index 1a1627e8..1554c920 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_sword.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_trapdoor.json index 3c365799..ffe1b49c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_trapdoor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/emerald_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/emerald_wall.json index 5117721a..de9a297d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/emerald_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/emerald_wall.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/emerald" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/flint_and_steel.json b/src/generated/resources/data/basemetals/advancements/recipes/flint_and_steel.json index ce833727..ce7c9725 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/flint_and_steel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/flint_and_steel.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_arrow.json index 5bcd9d81..0ff8d8e0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_arrow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/gold" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_bars.json index ced757c7..92ed0893 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_bars.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/gold" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_bars_2.json index 96a91075..de440f20 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_bars_2.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/gold" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_bolt.json index 6c8b136e..8ec0f5f8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_bolt.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/gold" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_bow.json index 40df4ad6..13064da8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_bow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/gold" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_button.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_button.json index 3a93484a..92d399b9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_button.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/gold" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_crackhammer.json index 09157852..e3c181bc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/gold" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_crossbow.json index 3f78a918..443a0fa6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_crossbow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/gold" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_door.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_door.json index 206d53c6..c4be71d3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_door.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/gold" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_fishingrod.json index cf745426..486fc360 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_fishingrod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/gold" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_gear.json index 78f06a6f..ccb78614 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_gear.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/gold" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_lever.json index 58f6b750..8166b5bc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_lever.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/gold" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_plate.json index 0e39a21d..8f035fdd 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/gold" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_powder_from_small.json index 296768f6..07720c41 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/gold" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_rod.json index 2c879cfb..68a7a6fe 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_rod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/gold" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_scythe.json index 6eaf2e93..0158bd14 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/gold" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_shears.json index 311e16de..29c9dc3c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_shears.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/gold" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_shield.json index 01aa4ea4..09704f0b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_shield.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/gold" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_slab.json index 3f8d2d8f..cfd33ec2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_slab.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/gold" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_smallpowder.json index bf4f45b2..b75365d8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/gold" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_stairs.json index 4fff7f31..316eb052 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_stairs.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/gold" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_trapdoor.json index 8073b1f8..9f3ce86d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_trapdoor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/gold" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/gold_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/gold_wall.json index c684bf8c..70706863 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/gold_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/gold_wall.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/gold" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/human_detector.json b/src/generated/resources/data/basemetals/advancements/recipes/human_detector.json index ac6145c5..4dd28de5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/human_detector.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/human_detector.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_arrow.json index 60ee43cd..a78ef0a2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_arrow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_axe.json index 6ff43db7..4190c65b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_axe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_bars.json index 15e436c6..c5870dc7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_bars.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_bars_2.json index 03ab0951..564e0e49 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_bars_2.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_blend.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_blend.json index 92811310..4339456b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_blend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_blend.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_blend_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_blend_from_small.json index 56e45bd1..9956bed4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_blend_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_blend_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_block.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_block.json index b3dc5fc1..ba9aa9e6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_block.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_block_ingot.json index 77425f0e..92b34777 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_block_ingot.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_bolt.json index bfc06865..d1790ffc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_bolt.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_boots.json index d265d567..6c7bd13d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_boots.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_bow.json index 6c3824ac..bcaae00e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_bow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_button.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_button.json index 1427f481..9a79e56c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_button.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_chestplate.json index f43daa2e..902bde7e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_chestplate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_crackhammer.json index c7f11af7..74e6c16a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_crossbow.json index 8b346399..9e20386b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_crossbow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_door.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_door.json index 8b14f47d..8ab958f8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_door.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_fishingrod.json index e11c721b..3b06441d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_fishingrod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_gear.json index 1059ba09..0569ea4e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_gear.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_helmet.json index 028a4714..0410acd0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_helmet.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_hoe.json index 21b611aa..2eee1a69 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_hoe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_horsearmor.json index fe03fba3..9709f412 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_horsearmor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_ingot_from_nuggets.json index dfea585a..ee6ee477 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_ingot_from_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_leggings.json index 9a0851e7..e9d7c0bd 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_leggings.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_lever.json index 292bc93d..d484abf8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_lever.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_nuggets.json index b599dba6..56e65199 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_pickaxe.json index 4176e357..8148978f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_pickaxe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_plate.json index e2e865bb..3644d82f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_powder_from_small.json index 22df95f7..e72b4267 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_pressure_plate.json index d13f2f21..6da78a5a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_pressure_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_rod.json index c11a76be..cf524a20 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_rod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_scythe.json index e9e35c89..77f559d2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_shears.json index 30e118f4..32541d4c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_shears.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_shield.json index b24f54e7..69e54df7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_shield.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_shovel.json index 484ad5f0..8b14fef4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_shovel.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_slab.json index 7e521e8d..b7e864ee 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_slab.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_smallblend.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_smallblend.json index d7115ad6..04c0d9bd 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_smallblend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_smallblend.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_smallpowder.json index 75f4f2b6..1c21386d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_stairs.json index f4852e2b..91a16cf7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_stairs.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_sword.json index ac2218c6..4c260b65 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_sword.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_trapdoor.json index 53f51d9a..0cf9d1fa 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_trapdoor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/invar_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/invar_wall.json index c0cc5268..a58a00a0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/invar_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/invar_wall.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/invar" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_arrow.json index c843504e..6aeae6db 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_arrow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/iron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_bars_2.json index 61c6b059..d0fdeb4b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_bars_2.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/iron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_bolt.json index 1823aa82..11f6a1eb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_bolt.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/iron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_bow.json index dccdbc08..c3f3d21f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_bow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/iron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_button.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_button.json index eb391a05..c90a9522 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_button.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/iron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_crackhammer.json index 1b2e2f63..68bbe70f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/iron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_crossbow.json index 30e27bad..a81098f2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_crossbow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/iron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_fishingrod.json index 5fdd6f01..111ed3dc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_fishingrod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/iron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_gear.json index c789c468..a62b25a8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_gear.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/iron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_lever.json index 310c7bb1..057c9ffe 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_lever.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/iron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_plate.json index 5a46d8e4..0f114979 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/iron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_powder_from_small.json index 225e6d68..36492ad5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/iron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_rod.json index 72190233..1ef853c5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_rod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/iron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_scythe.json index f086dd85..30e38139 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/iron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_shield.json index 0db879cf..8b4847c8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_shield.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/iron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_slab.json index 73402b6f..5f97c962 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_slab.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/iron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_smallpowder.json index 646d67c0..f4492219 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/iron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_stairs.json index 8fe3b15a..6b3f7cb0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_stairs.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/iron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/iron_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/iron_wall.json index c47390c1..0ff3dbe4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/iron_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/iron_wall.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/iron" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_arrow.json index 65928bf2..2bbddd1d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_arrow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_axe.json index d1b31565..b78f678c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_axe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_bars.json index b823065b..55e7be14 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_bars.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_bars_2.json index fb999f23..1eb7f888 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_bars_2.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_block.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_block.json index b9ea969c..dd87e699 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_block.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_block_ingot.json index 4a7837ee..7423ed6d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_block_ingot.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_bolt.json index 8be7a557..906839e4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_bolt.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_boots.json index badc1c5b..565d7582 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_boots.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_bow.json index d87f4724..94b387d1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_bow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_button.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_button.json index 9cdcbbdd..57f2fbf8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_button.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_chestplate.json index 5e34296f..5bc5ec59 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_chestplate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_crackhammer.json index 0d7ad54f..f87418d6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_crossbow.json index 4de5ceb1..7fadbe01 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_crossbow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_door.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_door.json index 0cd6c4cb..ff50cac8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_door.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_fishingrod.json index 9783d234..43d565d6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_fishingrod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_gear.json index c255c322..9191c1ae 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_gear.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_helmet.json index aca9b5b0..e960aede 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_helmet.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_hoe.json index 962b20ff..a98615d3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_hoe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_horsearmor.json index a5be2c8a..2982648b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_horsearmor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_ingot_from_nuggets.json index 6c8adcb1..aa09a2d3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_ingot_from_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_leggings.json index 879b0312..cc898f41 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_leggings.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_lever.json index 6b75196b..22bac4ad 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_lever.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_nuggets.json index f608fab4..58e99f04 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_pickaxe.json index a9db2710..bf7385ad 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_pickaxe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_plate.json index 6e383d92..91c7344e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_powder_from_small.json index 84b85e54..8621ab41 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_pressure_plate.json index dae28229..21163e70 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_pressure_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_rod.json index 2e344864..5960ebbb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_rod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_scythe.json index 75cf6d45..fe688f64 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_shears.json index 091ffa04..8897f078 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_shears.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_shield.json index 57b8a9f6..8c111429 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_shield.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_shovel.json index fe0dddb3..64c98b24 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_shovel.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_slab.json index 82b13f8f..319ff8c2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_slab.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_smallpowder.json index ea5cfccc..7e041bd4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_stairs.json index 0f5a7b8f..0e90873f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_stairs.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_sword.json index 87d9de7e..351439af 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_sword.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_trapdoor.json index b008580e..603e381c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_trapdoor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/lead_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/lead_wall.json index 41af1de3..4b9890da 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/lead_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/lead_wall.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/lead" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mercury_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/mercury_ingot_from_nuggets.json index dc9d95b8..443979ac 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mercury_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mercury_ingot_from_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mercury" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mercury_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/mercury_nuggets.json index bb5cb6be..5ff43a29 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mercury_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mercury_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mercury" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mercury_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/mercury_powder_from_small.json index 06b4a9ad..d16634f4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mercury_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mercury_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mercury" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mercury_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/mercury_smallpowder.json index b0adc1b6..fe7f0ade 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mercury_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mercury_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mercury" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/minecart.json b/src/generated/resources/data/basemetals/advancements/recipes/minecart.json index 4263fe5e..688a2fd8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/minecart.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/minecart.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_arrow.json index 30d633eb..50817e5e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_arrow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_axe.json index 656af788..2a99e685 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_axe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_bars.json index 81461334..48a7a59f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_bars.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_bars_2.json index 8d4daa0a..05cf7ac7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_bars_2.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_blend.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_blend.json index aba5513c..6cfe8416 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_blend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_blend.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -40,6 +50,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2", diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_blend_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_blend_from_small.json index 87ca747a..90f6718a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_blend_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_blend_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_block.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_block.json index e8e83de9..049f51d3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_block.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_block_ingot.json index 530216cd..83da6599 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_block_ingot.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_bolt.json index 3f239f34..d007c644 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_bolt.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_boots.json index 03aaf749..b4539dd2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_boots.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_bow.json index a4c6842c..e015877b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_bow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_button.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_button.json index 2876480b..ed1d808d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_button.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_chestplate.json index 80d7bcd8..704f446b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_chestplate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_crackhammer.json index 186565c0..ad7ed39c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_crossbow.json index 9d0f56b0..5d14e218 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_crossbow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_door.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_door.json index 6c5c6410..c1ee6950 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_door.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_fishingrod.json index ade207e3..51991d11 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_fishingrod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_gear.json index a2e6f852..52ce4f0e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_gear.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_helmet.json index 9e7f05c6..6487587d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_helmet.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_hoe.json index 270fd1b9..1b0042bf 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_hoe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_horsearmor.json index efedbf1c..fc763cd0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_horsearmor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_ingot_from_nuggets.json index 25a47b39..bb4a5c80 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_ingot_from_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_leggings.json index 4941d51d..74a51938 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_leggings.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_lever.json index 54e630eb..95603854 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_lever.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_nuggets.json index 625df38f..ee0f0053 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_pickaxe.json index fb55450a..c4ae18f6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_pickaxe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_plate.json index 29991c93..8b7b033f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_powder_from_small.json index 58cbbe1a..0cdddc42 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_pressure_plate.json index b31af853..f0ac780e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_pressure_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_rod.json index 0bc133b4..c32c650b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_rod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_scythe.json index 47dd7d3c..6949087d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_shears.json index f8f728bb..96a09ab1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_shears.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_shield.json index 8c235d8f..050a5a6e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_shield.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_shovel.json index 2ac74f15..0daa67ee 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_shovel.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_slab.json index 8ad00d05..5de0801c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_slab.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_smallblend.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_smallblend.json index 3b27d2c7..9407d67d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_smallblend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_smallblend.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_smallpowder.json index ff3ec9e1..4b633c2f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_stairs.json index 3a31d27b..167ad397 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_stairs.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_sword.json index adf8108c..2f537539 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_sword.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_trapdoor.json index 18ed27c6..87745c15 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_trapdoor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/mithril_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/mithril_wall.json index 92a7e66b..a1fa0b9c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/mithril_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/mithril_wall.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/mithril" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_arrow.json index 09b4357d..c9ccd735 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_arrow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_axe.json index da4c9024..acef29ef 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_axe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_bars.json index 48fe2ee5..cecf5b3a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_bars.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_bars_2.json index c8ee6c9f..9156a369 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_bars_2.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_block.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_block.json index de6749e3..2939d291 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_block.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_block_ingot.json index 465ed846..8d87dd28 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_block_ingot.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_bolt.json index 28775356..e056b419 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_bolt.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_boots.json index 1df3a528..e97660f4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_boots.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_bow.json index 19145f75..99088a74 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_bow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_button.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_button.json index 21b33ba9..9782b4d6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_button.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_chestplate.json index b37063d8..467e04d3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_chestplate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_crackhammer.json index e5c1fd46..e0d74aeb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_crossbow.json index 879a3474..94e9de24 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_crossbow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_door.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_door.json index f5abfbe3..a6795e0b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_door.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_fishingrod.json index a607b0ea..2ea9b808 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_fishingrod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_gear.json index 0623105a..43b97aca 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_gear.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_helmet.json index cf92d4e2..303b9e08 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_helmet.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_hoe.json index 47493ac2..7dd81be1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_hoe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_horsearmor.json index 1b2f9b5e..5aee4eaa 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_horsearmor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_ingot_from_nuggets.json index 8cfabc42..7bc619a7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_ingot_from_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_leggings.json index 125ce93c..d423aa64 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_leggings.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_lever.json index 633fb2e6..21d39f0f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_lever.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_nuggets.json index a8252c44..79a2c800 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_pickaxe.json index 78119835..211adf99 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_pickaxe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_plate.json index 1f603d6c..84d10316 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_powder_from_small.json index 0a43acb1..d045dce9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_pressure_plate.json index 1cb8f96b..9b14c5d5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_pressure_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_rod.json index f5da52c2..62327fbd 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_rod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_scythe.json index 6ac59154..23b52c5d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_shears.json index 117f3568..99fd432d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_shears.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_shield.json index c6f2c458..15aa0c34 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_shield.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_shovel.json index bd40fb4a..43493cb0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_shovel.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_slab.json index 0412c00e..f41b751a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_slab.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_smallpowder.json index d5c8965a..a8f4742f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_stairs.json index c6b59dc3..98d096a3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_stairs.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_sword.json index b244fca2..5e374f5e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_sword.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_trapdoor.json index 9bec0fcb..cca5957c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_trapdoor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/nickel_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/nickel_wall.json index 40d08e20..c85eac00 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/nickel_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/nickel_wall.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/nickel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_arrow.json index 87a51c1f..6b2eec19 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_arrow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_axe.json index d5497824..60978738 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_axe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bars.json index d04d30f1..cb4b6aaa 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bars.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bars_2.json index d8d71b5d..2ca4a77e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bars_2.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_block.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_block.json index b41e71ef..76489d8b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_block.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bolt.json index 3eb1aa48..59c5f461 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bolt.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_boots.json index 14376ea8..b117964a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_boots.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bow.json index e5623956..b3deb7e5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_bow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_button.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_button.json index f1134513..e1861d99 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_button.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_chestplate.json index edb19907..593b7999 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_chestplate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_crackhammer.json index 8f429d46..b13b78e0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_crossbow.json index 9477daae..506f84c4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_crossbow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_door.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_door.json index 6493e320..0bbf0a78 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_door.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_fishingrod.json index 453852b8..74c545f8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_fishingrod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_gear.json index 3ecf7ad4..57a1d393 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_gear.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_helmet.json index 15c4d8e6..cddff534 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_helmet.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_hoe.json index b07eee37..bb3048a0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_hoe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_horsearmor.json index f7103161..11f6ff84 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_horsearmor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_ingot.json index 76bfc30d..85b1fd31 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_ingot.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_leggings.json index 9df7ef1c..360a7fe3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_leggings.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_lever.json index 032c05ea..39c75361 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_lever.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_nugget.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_nugget.json index 52b09ea9..f4392a44 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_nugget.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_nugget.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_pickaxe.json index 9cc896f0..80684405 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_pickaxe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_powder_from_small.json index a6dc0d08..65b16039 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_pressure_plate.json index cd54b5e8..f8c29ba4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_pressure_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_rod.json index a224d4d0..b6784a24 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_rod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_scythe.json index 9290e53e..cc177f5e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_shears.json index 94982005..d4c55760 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_shears.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_shield.json index eaea2dd7..b17a571c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_shield.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_shovel.json index d8e9f9fb..23238c49 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_shovel.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_slab.json index a2387991..9f3897f5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_slab.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_smallpowder.json index d041ab85..95ae12e9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_stairs.json index 5fa4d8cc..cf3a8db3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_stairs.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_sword.json index 2ad3cb6c..0db31733 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_sword.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_trapdoor.json index 5ad87b0a..e81060c5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_trapdoor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_wall.json index 43e80a3e..59e1e729 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/obsidian_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/obsidian_wall.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/obsidian" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_arrow.json index a2605445..be2c0c0a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_arrow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_axe.json index fedd5c90..8a943f43 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_axe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_bars.json index 323b978f..864b724b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_bars.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_bars_2.json index e9ab030d..e709979f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_bars_2.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_blend.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_blend.json index c77a7ad5..3306b282 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_blend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_blend.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -40,6 +50,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2", diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_blend_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_blend_from_small.json index 5549c4a9..b14970ab 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_blend_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_blend_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_block.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_block.json index 4df0e74b..c3c5fbb3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_block.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_block_ingot.json index 7dd06e39..39165ee0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_block_ingot.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_bolt.json index 7594b177..1be938b5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_bolt.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_boots.json index 6017ab85..e8c4bc47 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_boots.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_bow.json index a382bdd3..f977f6a4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_bow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_button.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_button.json index 851452ff..e5cf40c0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_button.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_chestplate.json index aa9bc40c..8e8b86ac 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_chestplate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_crackhammer.json index 1094551c..1938d69f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_crossbow.json index 3893fb2b..37985852 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_crossbow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_door.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_door.json index 2c652daa..911dc310 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_door.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_fishingrod.json index 3455af0d..7ad319e1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_fishingrod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_gear.json index 676c1b50..874e9fb8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_gear.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_helmet.json index 8a39d86b..2737ab9e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_helmet.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_hoe.json index 82a693c0..a4d501c7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_hoe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_horsearmor.json index cd9f9f41..34c44043 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_horsearmor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_ingot_from_nuggets.json index 58c4fbc2..1dc7f870 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_ingot_from_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_leggings.json index 8db47e31..0f569fd7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_leggings.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_lever.json index 72c7aa31..9e25afaf 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_lever.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_nuggets.json index 65d449cd..9884b7b0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_pickaxe.json index ed862c2e..1a184d7c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_pickaxe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_plate.json index 5d974f67..f7e1cc11 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_powder_from_small.json index bf098d73..7069eec7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_pressure_plate.json index 1f8b7b0e..cb2d9148 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_pressure_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_rod.json index d6b78927..7d029eb5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_rod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_scythe.json index 05a1946e..5644e3cf 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_shears.json index a2aaaecb..57f17480 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_shears.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_shield.json index c0c2a73b..b3908f02 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_shield.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_shovel.json index 62bfd285..d9eed9dc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_shovel.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_slab.json index 3034a3bc..41306a36 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_slab.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_smallblend.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_smallblend.json index 60097e24..b90c531b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_smallblend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_smallblend.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_smallpowder.json index 6d78877f..3f7f3f86 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_stairs.json index 68857d32..e2d9fc7c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_stairs.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_sword.json index 015d0f99..b8459547 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_sword.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_trapdoor.json index a2137290..a740cbd3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_trapdoor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/pewter_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/pewter_wall.json index 9d355b0e..b876acb4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/pewter_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/pewter_wall.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/pewter" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/piston.json b/src/generated/resources/data/basemetals/advancements/recipes/piston.json index 06c3aa28..156d62e6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/piston.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/piston.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -50,6 +60,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2", diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_arrow.json index e06ae632..356842b8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_arrow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_axe.json index 7e9e503a..5ac3443c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_axe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_bars.json index 811993a9..86accda1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_bars.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_bars_2.json index f4d30c99..a23cabf7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_bars_2.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_block.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_block.json index e9910d19..2def87f2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_block.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_block_ingot.json index 2cb5eece..819d0f5d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_block_ingot.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_bolt.json index b1126c6f..11da5bb9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_bolt.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_boots.json index c466bcc6..3ad73dd4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_boots.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_bow.json index 41d34fb8..541fe879 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_bow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_button.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_button.json index bf1c32ae..5dd9576c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_button.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_chestplate.json index d048749f..37f7d6aa 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_chestplate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_crackhammer.json index 9c88b11f..0aa6cbbc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_crossbow.json index c7ed5799..8cd8e623 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_crossbow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_door.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_door.json index 65d5f11f..01578ea5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_door.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_fishingrod.json index 286b8bf1..301a3b52 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_fishingrod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_gear.json index f55ea695..a5015faa 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_gear.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_helmet.json index f3b8a695..27cda1c1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_helmet.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_hoe.json index edb8f4d8..1b262bf9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_hoe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_horsearmor.json index d4a154e7..2f3e982a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_horsearmor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_ingot_from_nuggets.json index 920e34d6..3e0b47ef 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_ingot_from_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_leggings.json index 127ad60e..6ecb1c3c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_leggings.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_lever.json index b4c26df2..1d47e055 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_lever.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_nuggets.json index 934d44f9..d5284369 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_pickaxe.json index 092a6ec6..262a0177 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_pickaxe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_plate.json index 022bd6ff..841a9f2a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_powder_from_small.json index 726d4cf5..92b896e2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_pressure_plate.json index 6316380e..edfd54d1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_pressure_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_rod.json index 48cb83c3..f19f9b93 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_rod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_scythe.json index b949b9b5..012e9f79 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_shears.json index f02b2348..9f36f67a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_shears.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_shield.json index 7fac5648..bf6c8ae6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_shield.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_shovel.json index ceb303b9..fcea5025 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_shovel.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_slab.json index 7789f92e..c180eaea 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_slab.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_smallpowder.json index 43acbe62..d2059072 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_stairs.json index bbdfdaab..f1515132 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_stairs.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_sword.json index 78f01082..bcecb396 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_sword.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_trapdoor.json index 13f116c7..fe3ead68 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_trapdoor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/platinum_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/platinum_wall.json index c16dc9cf..398e0f47 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/platinum_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/platinum_wall.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/platinum" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_arrow.json index 5a53a7dc..4019d992 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_arrow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_axe.json index a796e3af..3e2b37ea 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_axe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_bars.json index c5b0ffef..d13633ae 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_bars.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_bars_2.json index df87cc2c..d0551b16 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_bars_2.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_bolt.json index 062c9771..5085916d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_bolt.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_boots.json index 516d6074..b42eae34 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_boots.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_bow.json index 3fd676c6..0d03f909 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_bow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_button.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_button.json index 0f77be67..59c40b50 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_button.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_chestplate.json index 7bc0c0a0..e94f087c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_chestplate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_crackhammer.json index 80c14ec1..d4b15de4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_crossbow.json index 03fdc0f3..5ff7db04 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_crossbow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_door.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_door.json index 97ab973f..f1dc9b60 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_door.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_fishingrod.json index ac410fe6..58e52707 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_fishingrod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_gear.json index 1fdf304a..794424fd 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_gear.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_helmet.json index b18cbc11..e104a72c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_helmet.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_hoe.json index 7bbbaab5..073a8439 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_hoe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_horsearmor.json index 5e9141ab..a52f4117 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_horsearmor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_ingot.json index 987681eb..8aa9521c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_ingot.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_leggings.json index c22cf7aa..6fccd045 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_leggings.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_lever.json index 83e733f8..a3507868 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_lever.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_nugget.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_nugget.json index 9eaf4d3d..8fa3e966 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_nugget.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_nugget.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_pickaxe.json index 85a89745..9e09b596 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_pickaxe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_powder_from_small.json index 499d7cd0..6a262323 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_pressure_plate.json index c7c690d9..33c85d4c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_pressure_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_rod.json index 3d5d0698..39df2274 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_rod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_scythe.json index 8bbcc7ee..3f3ff334 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_shears.json index f260a15c..314e452b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_shears.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_shield.json index 2ba8a9d9..a64cb295 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_shield.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_shovel.json index 12842035..d5277f34 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_shovel.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_smallpowder.json index a274c992..e4c919c5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_sword.json index 193cf7de..78d69613 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_sword.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_trapdoor.json index 314a2b42..9015ab2b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_trapdoor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/quartz_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/quartz_wall.json index 20be2c19..73d5b88f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/quartz_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/quartz_wall.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:gems/quartz" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/rail.json b/src/generated/resources/data/basemetals/advancements/recipes/rail.json index 83c7b459..15e2afbf 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/rail.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/rail.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/redstone_from_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/redstone_from_smallpowder.json index 75331c9a..ebc27529 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/redstone_from_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/redstone_from_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:dusts/redstone" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/redstone_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/redstone_smallpowder.json index 76150ba1..d20d89ba 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/redstone_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/redstone_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:dusts/redstone" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_arrow.json index 951e9260..d7cd6011 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_arrow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_axe.json index 02eface1..f5cb7d33 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_axe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_bars.json index 7ea8a5c0..c8b26712 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_bars.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_bars_2.json index 9e236f62..31be7121 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_bars_2.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_block.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_block.json index 9ee376c5..6277cf15 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_block.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_block_ingot.json index 96f19350..a8dd9348 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_block_ingot.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_bolt.json index 90b5b353..6438b4d8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_bolt.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_boots.json index 13b64776..54f6a778 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_boots.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_bow.json index 0cdf3d90..887cdbf1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_bow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_button.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_button.json index 67d98217..d2a58332 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_button.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_chestplate.json index 76c9eaad..55edbdd4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_chestplate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_crackhammer.json index 8f2330fd..681c9e75 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_crossbow.json index 89d529d7..0abd9f35 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_crossbow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_door.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_door.json index 6f8fb92a..5b2dac2c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_door.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_fishingrod.json index feb2b408..73513c95 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_fishingrod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_gear.json index 2a849c32..9793b582 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_gear.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_helmet.json index 5379037e..9186d578 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_helmet.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_hoe.json index 9fd252ef..d09005e6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_hoe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_horsearmor.json index 2c642997..d2c12fd7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_horsearmor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_ingot_from_nuggets.json index 1d1d9315..322d111c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_ingot_from_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_leggings.json index 4a8cbde0..b13fc0b6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_leggings.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_lever.json index 0c2d94a4..50a796f7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_lever.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_nuggets.json index 0de9b946..7c267435 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_pickaxe.json index cb46fb4d..ba14e7bd 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_pickaxe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_plate.json index 482fe9c2..27c490e5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_powder_from_small.json index fe915a34..0862494c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_pressure_plate.json index f3965090..01e290ec 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_pressure_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_rod.json index 36221156..ec503dc0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_rod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_scythe.json index 2f9a58f7..20540559 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_shears.json index 1ea5b29d..4f27edb4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_shears.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_shield.json index 80b7a591..c1f7674d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_shield.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_shovel.json index f889e6f7..74d0233c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_shovel.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_slab.json index 6843f536..7b24e6cd 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_slab.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_smallpowder.json index 7376700f..4b4d978a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_stairs.json index 94bd701c..4ea1102d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_stairs.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_sword.json index c8829073..d8e85cbb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_sword.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_trapdoor.json index 08de37b4..de98a85f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_trapdoor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/silver_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/silver_wall.json index 8cfc637e..8d0cb560 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/silver_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/silver_wall.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_arrow.json index 7aea6084..9e50c8e2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_arrow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_axe.json index 5099ca3d..60561fcf 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_axe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bars.json index 0014e20d..0bd454a2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bars.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bars_2.json index 55e5f8a8..d570452b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bars_2.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_block.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_block.json index 0fb13d5e..0e8f947c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_block.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_block_ingot.json index 78442c74..c9c8c39f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_block_ingot.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bolt.json index a03ff125..1050138e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bolt.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_boots.json index def61024..22ed8a80 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_boots.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bow.json index f2aaecd5..44fefd7a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_bow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_button.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_button.json index 804c466b..a8c37ead 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_button.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_chestplate.json index 3f8a2662..4b96b1be 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_chestplate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_crackhammer.json index 69af8887..ee50c593 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_crossbow.json index 8d50b163..ff10d9f8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_crossbow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_door.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_door.json index 8bf5ce01..5efbe696 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_door.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_fishingrod.json index f4111a50..74d389f8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_fishingrod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_gear.json index 5c1e0009..eb9c9a46 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_gear.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_helmet.json index 2c2f9087..ca77f682 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_helmet.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_hoe.json index 0555d5a0..a68948e0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_hoe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_horsearmor.json index b84b042d..aa8840a2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_horsearmor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_ingot_from_nuggets.json index 388f64a0..0bd9c72e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_ingot_from_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_leggings.json index fb88bcfb..4ac8c096 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_leggings.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_lever.json index b9e90f8d..80d63e4c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_lever.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_nuggets.json index 0203b26c..50a628e3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_pickaxe.json index 69e00d60..4c2c1c5c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_pickaxe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_plate.json index e7bdad95..d2eea4d0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_powder_from_small.json index 5cb8a4ed..a7a00528 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_pressure_plate.json index dd30d374..4738019b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_pressure_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_rod.json index e5b04e45..2decfa0a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_rod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_scythe.json index 58fa20eb..2df8668e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_shears.json index 9138a811..358474ee 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_shears.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_shield.json index 84c45245..3681fafb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_shield.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_shovel.json index a0699786..36fa48a2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_shovel.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_slab.json index 649bf9e2..a2c8d3b5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_slab.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_smallpowder.json index cb42fab9..0434e510 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_stairs.json index f71c57a3..4f6edd81 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_stairs.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_sword.json index 52e16685..1d4d9fb2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_sword.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_trapdoor.json index c5c04094..e00e63ff 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_trapdoor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_wall.json index 5edc219f..ec94b3fe 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/starsteel_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/starsteel_wall.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/starsteel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_anvil.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_anvil.json index a2ae5e07..d8778e03 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_anvil.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_anvil.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_arrow.json index 9de9e044..19b34b73 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_arrow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_axe.json index f2944b9a..e3c4750e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_axe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_bars.json index 2d72b94f..128408de 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_bars.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_bars_2.json index b287bb9c..3fba4477 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_bars_2.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_blend.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_blend.json index d0d9fc9c..eb73e5bc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_blend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_blend.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_blend_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_blend_from_small.json index 1bc8afa0..47936c94 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_blend_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_blend_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_block.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_block.json index 2830340d..3af0df2b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_block.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_block_ingot.json index d8de3bcd..1cfead4f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_block_ingot.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_bolt.json index a1050044..8edb8d51 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_bolt.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_boots.json index 710a1669..083c2506 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_boots.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_bow.json index 2451d076..ae8160e4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_bow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_button.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_button.json index a32184d4..1d50d1d6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_button.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_chestplate.json index e4870ea9..e86b2e69 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_chestplate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_crackhammer.json index fd22a178..52c80587 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_crossbow.json index 95d764a4..dd989532 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_crossbow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_door.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_door.json index 0e8f49df..c1569906 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_door.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_fishingrod.json index 002cb93a..d0541dde 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_fishingrod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_gear.json index f345f39c..6d299f32 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_gear.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_helmet.json index 06d6b689..a2d9b9a1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_helmet.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_hoe.json index e3f33c52..49862681 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_hoe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_horsearmor.json index 5ca63642..42e520b4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_horsearmor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_ingot_from_nuggets.json index b22789f3..d19129e6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_ingot_from_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_leggings.json index c55b8998..2145e20f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_leggings.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_lever.json index 3be91202..8dfc2238 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_lever.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_nuggets.json index 4a104a3d..c3ec2e79 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_pickaxe.json index 5f2abc3f..b51f1777 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_pickaxe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_plate.json index ac76e327..10d2cfcf 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_powder_from_small.json index 74096110..5e169ac7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_pressure_plate.json index e3425c6d..53ffd765 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_pressure_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_rod.json index 484cd4cb..c04dc32f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_rod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_scythe.json index d4647da1..ee25344f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_shears.json index 7ba47919..f47c43f5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_shears.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_shield.json index 6fa50a54..e30a6927 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_shield.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_shovel.json index a766d00f..33c0d52d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_shovel.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_slab.json index 6de2a939..2036ced2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_slab.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_smallblend.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_smallblend.json index 092bbda7..8bff8153 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_smallblend.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_smallblend.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_smallpowder.json index 9de2523f..b469a40d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_stairs.json index b1a26c00..c3e86cda 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_stairs.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_sword.json index 582bc884..517aac1e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_sword.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_trapdoor.json index d078bb49..1a392969 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_trapdoor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/steel_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/steel_wall.json index 8ed4bccc..79478a3d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/steel_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/steel_wall.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/stone_anvil.json b/src/generated/resources/data/basemetals/advancements/recipes/stone_anvil.json index 3b496794..54f1aeb6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/stone_anvil.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/stone_anvil.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:stone" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -40,6 +50,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2", diff --git a/src/generated/resources/data/basemetals/advancements/recipes/stone_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/stone_crackhammer.json index 109029b0..4ddeaa47 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/stone_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/stone_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:stone" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/stone_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/stone_scythe.json index 900437e3..fec4a341 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/stone_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/stone_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:stone" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_arrow.json index 473eef31..5a831c43 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_arrow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_axe.json index acfa426f..cc0a1ff7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_axe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_bars.json index 3b59f7be..b38432df 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_bars.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_bars_2.json index fbf9605b..9686001e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_bars_2.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_block.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_block.json index 9190f6fb..3d2483cb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_block.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_block_ingot.json index c4b5a9f9..b934c789 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_block_ingot.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_bolt.json index 83fbc5ce..195a4f3f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_bolt.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_boots.json index 6b8b01fe..40c393c6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_boots.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_bow.json index b349b161..0a4ff40a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_bow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_button.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_button.json index 5caa0634..fd13087b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_button.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_chestplate.json index 6ff86285..bd3b3db8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_chestplate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_crackhammer.json index 8fdd6541..bef3840f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_crossbow.json index cc36fc7f..151bdf0f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_crossbow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_door.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_door.json index fc7a197d..9431ebfc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_door.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_fishingrod.json index 4218fdf2..a5275d4f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_fishingrod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_gear.json index 7a0f8b6e..a8ac75d8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_gear.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_helmet.json index b7ddfb87..fe65563b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_helmet.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_hoe.json index 0e261816..0b016426 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_hoe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_horsearmor.json index d18f4d5c..dc7793c5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_horsearmor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_ingot_from_nuggets.json index ba91d290..ceffec7d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_ingot_from_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_leggings.json index 5d5b9950..4dab0bc9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_leggings.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_lever.json index eeb9b1e8..4e5a5d30 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_lever.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_nuggets.json index 9f7f3bb8..05132c1a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_pickaxe.json index 4639aa32..aa06e805 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_pickaxe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_plate.json index 501733dc..bc5ed7e1 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_powder_from_small.json index 0daaa465..f333fe77 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_pressure_plate.json index ad62dbcf..e9a4a51c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_pressure_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_rod.json index 121e48c7..0bd535c8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_rod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_scythe.json index 0ffb0649..7bf3eb1f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_shears.json index 94fb3e82..cc70c127 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_shears.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_shield.json index 5fca43b1..e9ab9d68 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_shield.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_shovel.json index 37d8d780..bb05a05c 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_shovel.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_slab.json index 80d34b10..3ac696c9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_slab.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_smallpowder.json index 9184b4a4..fe6c729a 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_stairs.json index e3b6a12e..2874fd31 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_stairs.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_sword.json index f425d4e8..678599bc 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_sword.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_trapdoor.json index dbe1e4d1..bee38af4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_trapdoor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tin_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/tin_wall.json index 9aec8dff..c8afe834 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tin_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tin_wall.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/tin" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/tripwire_hook.json b/src/generated/resources/data/basemetals/advancements/recipes/tripwire_hook.json index d8ba2725..ff3398a7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/tripwire_hook.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/tripwire_hook.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/steel" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/wood_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/wood_crackhammer.json index cb0cf14b..64c793c8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/wood_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/wood_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "minecraft:logs" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/wood_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/wood_scythe.json index 34120507..385ed55b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/wood_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/wood_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "minecraft:logs" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_arrow.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_arrow.json index 2831a095..416e1ee3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_arrow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_arrow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_axe.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_axe.json index 2ab72bd5..1e510563 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_axe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_axe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_bars.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_bars.json index b813ead8..f770aeaa 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_bars.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_bars.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_bars_2.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_bars_2.json index 6bc55bb9..3d2c6d2b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_bars_2.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_bars_2.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_block.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_block.json index e9fdb9cf..db85006d 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_block.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_block.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_block_ingot.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_block_ingot.json index d6117780..fd4791bd 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_block_ingot.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_block_ingot.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_bolt.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_bolt.json index 174e392c..c41fd715 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_bolt.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_bolt.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_boots.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_boots.json index 5caf8753..860c8f7f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_boots.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_boots.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_bow.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_bow.json index 48456701..def2ca85 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_bow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_bow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_button.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_button.json index 186434b9..34a20ba7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_button.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_button.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_chestplate.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_chestplate.json index b9cd773a..bb119b7b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_chestplate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_chestplate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_crackhammer.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_crackhammer.json index cd01e701..e07e1351 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_crackhammer.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_crackhammer.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_crossbow.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_crossbow.json index 8425d11a..b2f99570 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_crossbow.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_crossbow.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_door.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_door.json index 57dcd9bc..a8ae4cc6 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_door.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_door.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_fishingrod.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_fishingrod.json index ff882eb0..24b88192 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_fishingrod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_fishingrod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_gear.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_gear.json index e046cdd4..9120c9c0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_gear.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_gear.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_helmet.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_helmet.json index dfdf6a6f..bda38c33 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_helmet.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_helmet.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_hoe.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_hoe.json index 75d6ba6f..85cedfe5 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_hoe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_hoe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_horsearmor.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_horsearmor.json index 8d86bc2c..f5b40da8 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_horsearmor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_horsearmor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_ingot_from_nuggets.json index 8e0fc241..971099cb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_ingot_from_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_leggings.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_leggings.json index f6485b48..07261dbe 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_leggings.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_leggings.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_lever.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_lever.json index 9795e30e..b49a754e 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_lever.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_lever.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_nuggets.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_nuggets.json index 54103264..d5fd98a0 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_nuggets.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_nuggets.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_pickaxe.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_pickaxe.json index 386aa31b..84c1e20f 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_pickaxe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_pickaxe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_plate.json index 7dba8bb6..935afce2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_powder_from_small.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_powder_from_small.json index b12d4f27..bf3bf3a4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_powder_from_small.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_powder_from_small.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_pressure_plate.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_pressure_plate.json index 733dc4b3..e9d044f7 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_pressure_plate.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_pressure_plate.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_rod.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_rod.json index e64685e2..313d74b4 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_rod.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_rod.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_scythe.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_scythe.json index f5299417..4659fced 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_scythe.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_scythe.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_shears.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_shears.json index 60264a37..86e5c0b9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_shears.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_shears.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_shield.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_shield.json index 12e20016..c6ea729b 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_shield.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_shield.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -30,6 +40,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1", "has_ingredient_2" diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_shovel.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_shovel.json index 0a810b74..8a1580f3 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_shovel.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_shovel.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_slab.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_slab.json index f4fd5010..d3dfb0fb 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_slab.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_slab.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_smallpowder.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_smallpowder.json index 271db6bc..122681aa 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_smallpowder.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_smallpowder.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_stairs.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_stairs.json index 2f9f6b69..ce4f7310 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_stairs.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_stairs.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_sword.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_sword.json index adc75d55..d8de5bec 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_sword.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_sword.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_trapdoor.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_trapdoor.json index 09814b0a..b3a92ec9 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_trapdoor.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_trapdoor.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/advancements/recipes/zinc_wall.json b/src/generated/resources/data/basemetals/advancements/recipes/zinc_wall.json index 6d0babdb..022f97a2 100644 --- a/src/generated/resources/data/basemetals/advancements/recipes/zinc_wall.json +++ b/src/generated/resources/data/basemetals/advancements/recipes/zinc_wall.json @@ -1,6 +1,16 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "tag": "forge:ingots/zinc" + } + ] + } + }, "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { @@ -20,6 +30,7 @@ }, "requirements": [ [ + "has_material", "has_recipe", "has_ingredient_1" ] diff --git a/src/generated/resources/data/basemetals/loot_tables/chests/inject/abandoned_mineshaft.json b/src/generated/resources/data/basemetals/loot_tables/chests/inject/abandoned_mineshaft.json index 45bdec2b..092f80dc 100644 --- a/src/generated/resources/data/basemetals/loot_tables/chests/inject/abandoned_mineshaft.json +++ b/src/generated/resources/data/basemetals/loot_tables/chests/inject/abandoned_mineshaft.json @@ -38,6 +38,12 @@ "max": 6 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_ingot" + } ] }, { @@ -52,6 +58,12 @@ "max": 6 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:lead_ingot" + } ] }, { @@ -66,6 +78,12 @@ "max": 6 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:zinc_ingot" + } ] }, { @@ -80,6 +98,12 @@ "max": 6 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_ingot" + } ] }, { @@ -94,6 +118,12 @@ "max": 6 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:brass_ingot" + } ] }, { @@ -108,6 +138,12 @@ "max": 6 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_ingot" + } ] } ], @@ -169,207 +205,453 @@ { "type": "item", "name": "basemetals:iron_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:iron_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:tin_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_axe" + } + ] }, { "type": "item", "name": "basemetals:tin_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_boots" + } + ] }, { "type": "item", "name": "basemetals:tin_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_chestplate" + } + ] }, { "type": "item", "name": "basemetals:tin_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_helmet" + } + ] }, { "type": "item", "name": "basemetals:tin_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_hoe" + } + ] }, { "type": "item", "name": "basemetals:tin_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_leggings" + } + ] }, { "type": "item", "name": "basemetals:tin_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:tin_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_shovel" + } + ] }, { "type": "item", "name": "basemetals:tin_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_sword" + } + ] }, { "type": "item", "name": "basemetals:tin_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:copper_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_axe" + } + ] }, { "type": "item", "name": "basemetals:copper_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_boots" + } + ] }, { "type": "item", "name": "basemetals:copper_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_chestplate" + } + ] }, { "type": "item", "name": "basemetals:copper_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_helmet" + } + ] }, { "type": "item", "name": "basemetals:copper_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_hoe" + } + ] }, { "type": "item", "name": "basemetals:copper_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_leggings" + } + ] }, { "type": "item", "name": "basemetals:copper_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:copper_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_shovel" + } + ] }, { "type": "item", "name": "basemetals:copper_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_sword" + } + ] }, { "type": "item", "name": "basemetals:copper_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:bronze_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_axe" + } + ] }, { "type": "item", "name": "basemetals:bronze_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_boots" + } + ] }, { "type": "item", "name": "basemetals:bronze_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_chestplate" + } + ] }, { "type": "item", "name": "basemetals:bronze_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_helmet" + } + ] }, { "type": "item", "name": "basemetals:bronze_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_hoe" + } + ] }, { "type": "item", "name": "basemetals:bronze_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_leggings" + } + ] }, { "type": "item", "name": "basemetals:bronze_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:bronze_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_shovel" + } + ] }, { "type": "item", "name": "basemetals:bronze_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_sword" + } + ] }, { "type": "item", "name": "basemetals:bronze_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:steel_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_axe" + } + ] }, { "type": "item", "name": "basemetals:steel_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_boots" + } + ] }, { "type": "item", "name": "basemetals:steel_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_chestplate" + } + ] }, { "type": "item", "name": "basemetals:steel_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_helmet" + } + ] }, { "type": "item", "name": "basemetals:steel_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_hoe" + } + ] }, { "type": "item", "name": "basemetals:steel_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_leggings" + } + ] }, { "type": "item", "name": "basemetals:steel_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:steel_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_shovel" + } + ] }, { "type": "item", "name": "basemetals:steel_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_sword" + } + ] }, { "type": "item", "name": "basemetals:steel_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_crackhammer" + } + ] } ], "name": "basemetals_abandoned_mineshaft_1" diff --git a/src/generated/resources/data/basemetals/loot_tables/chests/inject/desert_pyramid.json b/src/generated/resources/data/basemetals/loot_tables/chests/inject/desert_pyramid.json index 7d1a5e4c..2aa969e8 100644 --- a/src/generated/resources/data/basemetals/loot_tables/chests/inject/desert_pyramid.json +++ b/src/generated/resources/data/basemetals/loot_tables/chests/inject/desert_pyramid.json @@ -126,6 +126,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:iron_crackhammer" + } ] }, { @@ -138,6 +144,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_axe" + } ] }, { @@ -150,6 +162,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_boots" + } ] }, { @@ -162,6 +180,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_chestplate" + } ] }, { @@ -174,6 +198,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_helmet" + } ] }, { @@ -186,6 +216,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_hoe" + } ] }, { @@ -198,6 +234,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_leggings" + } ] }, { @@ -210,6 +252,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_pickaxe" + } ] }, { @@ -222,6 +270,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_shovel" + } ] }, { @@ -234,6 +288,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_sword" + } ] }, { @@ -246,6 +306,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_crackhammer" + } ] }, { @@ -258,6 +324,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_axe" + } ] }, { @@ -270,6 +342,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_boots" + } ] }, { @@ -282,6 +360,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_chestplate" + } ] }, { @@ -294,6 +378,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_helmet" + } ] }, { @@ -306,6 +396,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_hoe" + } ] }, { @@ -318,6 +414,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_leggings" + } ] }, { @@ -330,6 +432,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_pickaxe" + } ] }, { @@ -342,6 +450,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_shovel" + } ] }, { @@ -354,6 +468,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_sword" + } ] }, { @@ -366,207 +486,453 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_crackhammer" + } ] }, { "type": "item", "name": "basemetals:invar_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_axe" + } + ] }, { "type": "item", "name": "basemetals:invar_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_boots" + } + ] }, { "type": "item", "name": "basemetals:invar_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_chestplate" + } + ] }, { "type": "item", "name": "basemetals:invar_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_helmet" + } + ] }, { "type": "item", "name": "basemetals:invar_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_hoe" + } + ] }, { "type": "item", "name": "basemetals:invar_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_leggings" + } + ] }, { "type": "item", "name": "basemetals:invar_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:invar_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_shovel" + } + ] }, { "type": "item", "name": "basemetals:invar_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_sword" + } + ] }, { "type": "item", "name": "basemetals:invar_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:coldiron_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_axe" + } + ] }, { "type": "item", "name": "basemetals:coldiron_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_boots" + } + ] }, { "type": "item", "name": "basemetals:coldiron_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_chestplate" + } + ] }, { "type": "item", "name": "basemetals:coldiron_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_helmet" + } + ] }, { "type": "item", "name": "basemetals:coldiron_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_hoe" + } + ] }, { "type": "item", "name": "basemetals:coldiron_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_leggings" + } + ] }, { "type": "item", "name": "basemetals:coldiron_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:coldiron_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_shovel" + } + ] }, { "type": "item", "name": "basemetals:coldiron_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_sword" + } + ] }, { "type": "item", "name": "basemetals:coldiron_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:mithril_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_axe" + } + ] }, { "type": "item", "name": "basemetals:mithril_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_boots" + } + ] }, { "type": "item", "name": "basemetals:mithril_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_chestplate" + } + ] }, { "type": "item", "name": "basemetals:mithril_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_helmet" + } + ] }, { "type": "item", "name": "basemetals:mithril_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_hoe" + } + ] }, { "type": "item", "name": "basemetals:mithril_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_leggings" + } + ] }, { "type": "item", "name": "basemetals:mithril_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:mithril_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_shovel" + } + ] }, { "type": "item", "name": "basemetals:mithril_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_sword" + } + ] }, { "type": "item", "name": "basemetals:mithril_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:aquarium_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_axe" + } + ] }, { "type": "item", "name": "basemetals:aquarium_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_boots" + } + ] }, { "type": "item", "name": "basemetals:aquarium_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_chestplate" + } + ] }, { "type": "item", "name": "basemetals:aquarium_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_helmet" + } + ] }, { "type": "item", "name": "basemetals:aquarium_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_hoe" + } + ] }, { "type": "item", "name": "basemetals:aquarium_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_leggings" + } + ] }, { "type": "item", "name": "basemetals:aquarium_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:aquarium_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_shovel" + } + ] }, { "type": "item", "name": "basemetals:aquarium_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_sword" + } + ] }, { "type": "item", "name": "basemetals:aquarium_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_crackhammer" + } + ] } ], "name": "basemetals_desert_pyramid_0" @@ -609,6 +975,12 @@ "max": 6 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:silver_ingot" + } ] }, { @@ -623,6 +995,12 @@ "max": 4 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:nickel_ingot" + } ] }, { @@ -637,6 +1015,12 @@ "max": 4 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:electrum_ingot" + } ] }, { @@ -651,6 +1035,12 @@ "max": 12 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_ingot" + } ] }, { @@ -665,6 +1055,12 @@ "max": 4 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_ingot" + } ] } ], diff --git a/src/generated/resources/data/basemetals/loot_tables/chests/inject/end_city_treasure.json b/src/generated/resources/data/basemetals/loot_tables/chests/inject/end_city_treasure.json index 6d7e7ff5..ec3e7266 100644 --- a/src/generated/resources/data/basemetals/loot_tables/chests/inject/end_city_treasure.json +++ b/src/generated/resources/data/basemetals/loot_tables/chests/inject/end_city_treasure.json @@ -18,6 +18,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_axe" + } ] }, { @@ -30,6 +36,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_boots" + } ] }, { @@ -42,6 +54,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_chestplate" + } ] }, { @@ -54,6 +72,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_helmet" + } ] }, { @@ -66,6 +90,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_hoe" + } ] }, { @@ -78,6 +108,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_leggings" + } ] }, { @@ -90,6 +126,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_pickaxe" + } ] }, { @@ -102,6 +144,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_shovel" + } ] }, { @@ -114,6 +162,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_sword" + } ] }, { @@ -126,6 +180,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_crackhammer" + } ] }, { @@ -138,6 +198,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_axe" + } ] }, { @@ -150,6 +216,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_boots" + } ] }, { @@ -162,6 +234,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_chestplate" + } ] }, { @@ -174,6 +252,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_helmet" + } ] }, { @@ -186,6 +270,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_hoe" + } ] }, { @@ -198,6 +288,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_leggings" + } ] }, { @@ -210,6 +306,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_pickaxe" + } ] }, { @@ -222,6 +324,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_shovel" + } ] }, { @@ -234,6 +342,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_sword" + } ] }, { @@ -246,6 +360,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_crackhammer" + } ] }, { @@ -258,6 +378,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_axe" + } ] }, { @@ -270,6 +396,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_boots" + } ] }, { @@ -282,6 +414,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_chestplate" + } ] }, { @@ -294,6 +432,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_helmet" + } ] }, { @@ -306,6 +450,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_hoe" + } ] }, { @@ -318,6 +468,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_leggings" + } ] }, { @@ -330,6 +486,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_pickaxe" + } ] }, { @@ -342,6 +504,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_shovel" + } ] }, { @@ -354,6 +522,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_sword" + } ] }, { @@ -366,6 +540,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_crackhammer" + } ] }, { @@ -378,6 +558,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_axe" + } ] }, { @@ -390,6 +576,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_boots" + } ] }, { @@ -402,6 +594,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_chestplate" + } ] }, { @@ -414,6 +612,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_helmet" + } ] }, { @@ -426,6 +630,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_hoe" + } ] }, { @@ -438,6 +648,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_leggings" + } ] }, { @@ -450,6 +666,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_pickaxe" + } ] }, { @@ -462,6 +684,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_shovel" + } ] }, { @@ -474,6 +702,12 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_sword" + } ] }, { @@ -486,107 +720,233 @@ "levels": 20, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_crackhammer" + } ] }, { "type": "item", "name": "basemetals:adamantine_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:adamantine_axe" + } + ] }, { "type": "item", "name": "basemetals:adamantine_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:adamantine_boots" + } + ] }, { "type": "item", "name": "basemetals:adamantine_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:adamantine_chestplate" + } + ] }, { "type": "item", "name": "basemetals:adamantine_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:adamantine_helmet" + } + ] }, { "type": "item", "name": "basemetals:adamantine_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:adamantine_hoe" + } + ] }, { "type": "item", "name": "basemetals:adamantine_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:adamantine_leggings" + } + ] }, { "type": "item", "name": "basemetals:adamantine_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:adamantine_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:adamantine_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:adamantine_shovel" + } + ] }, { "type": "item", "name": "basemetals:adamantine_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:adamantine_sword" + } + ] }, { "type": "item", "name": "basemetals:adamantine_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:adamantine_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:starsteel_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:starsteel_axe" + } + ] }, { "type": "item", "name": "basemetals:starsteel_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:starsteel_boots" + } + ] }, { "type": "item", "name": "basemetals:starsteel_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:starsteel_chestplate" + } + ] }, { "type": "item", "name": "basemetals:starsteel_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:starsteel_helmet" + } + ] }, { "type": "item", "name": "basemetals:starsteel_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:starsteel_hoe" + } + ] }, { "type": "item", "name": "basemetals:starsteel_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:starsteel_leggings" + } + ] }, { "type": "item", "name": "basemetals:starsteel_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:starsteel_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:starsteel_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:starsteel_shovel" + } + ] }, { "type": "item", "name": "basemetals:starsteel_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:starsteel_sword" + } + ] }, { "type": "item", "name": "basemetals:starsteel_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:starsteel_crackhammer" + } + ] } ], "name": "basemetals_end_city_treasure_0" @@ -611,6 +971,12 @@ "max": 4 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_ingot" + } ] }, { @@ -625,6 +991,12 @@ "max": 4 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_ingot" + } ] }, { @@ -639,6 +1011,12 @@ "max": 4 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_ingot" + } ] }, { @@ -653,6 +1031,12 @@ "max": 6 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:platinum_ingot" + } ] }, { @@ -667,6 +1051,12 @@ "max": 4 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:adamantine_ingot" + } ] }, { @@ -681,6 +1071,12 @@ "max": 4 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:starsteel_ingot" + } ] } ], diff --git a/src/generated/resources/data/basemetals/loot_tables/chests/inject/jungle_temple.json b/src/generated/resources/data/basemetals/loot_tables/chests/inject/jungle_temple.json index eb7a02a8..593039d0 100644 --- a/src/generated/resources/data/basemetals/loot_tables/chests/inject/jungle_temple.json +++ b/src/generated/resources/data/basemetals/loot_tables/chests/inject/jungle_temple.json @@ -126,6 +126,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:iron_crackhammer" + } ] }, { @@ -138,6 +144,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_axe" + } ] }, { @@ -150,6 +162,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_boots" + } ] }, { @@ -162,6 +180,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_chestplate" + } ] }, { @@ -174,6 +198,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_helmet" + } ] }, { @@ -186,6 +216,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_hoe" + } ] }, { @@ -198,6 +234,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_leggings" + } ] }, { @@ -210,6 +252,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_pickaxe" + } ] }, { @@ -222,6 +270,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_shovel" + } ] }, { @@ -234,6 +288,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_sword" + } ] }, { @@ -246,6 +306,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_crackhammer" + } ] }, { @@ -258,6 +324,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_axe" + } ] }, { @@ -270,6 +342,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_boots" + } ] }, { @@ -282,6 +360,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_chestplate" + } ] }, { @@ -294,6 +378,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_helmet" + } ] }, { @@ -306,6 +396,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_hoe" + } ] }, { @@ -318,6 +414,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_leggings" + } ] }, { @@ -330,6 +432,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_pickaxe" + } ] }, { @@ -342,6 +450,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_shovel" + } ] }, { @@ -354,6 +468,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_sword" + } ] }, { @@ -366,207 +486,453 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_crackhammer" + } ] }, { "type": "item", "name": "basemetals:invar_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_axe" + } + ] }, { "type": "item", "name": "basemetals:invar_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_boots" + } + ] }, { "type": "item", "name": "basemetals:invar_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_chestplate" + } + ] }, { "type": "item", "name": "basemetals:invar_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_helmet" + } + ] }, { "type": "item", "name": "basemetals:invar_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_hoe" + } + ] }, { "type": "item", "name": "basemetals:invar_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_leggings" + } + ] }, { "type": "item", "name": "basemetals:invar_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:invar_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_shovel" + } + ] }, { "type": "item", "name": "basemetals:invar_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_sword" + } + ] }, { "type": "item", "name": "basemetals:invar_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:coldiron_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_axe" + } + ] }, { "type": "item", "name": "basemetals:coldiron_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_boots" + } + ] }, { "type": "item", "name": "basemetals:coldiron_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_chestplate" + } + ] }, { "type": "item", "name": "basemetals:coldiron_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_helmet" + } + ] }, { "type": "item", "name": "basemetals:coldiron_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_hoe" + } + ] }, { "type": "item", "name": "basemetals:coldiron_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_leggings" + } + ] }, { "type": "item", "name": "basemetals:coldiron_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:coldiron_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_shovel" + } + ] }, { "type": "item", "name": "basemetals:coldiron_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_sword" + } + ] }, { "type": "item", "name": "basemetals:coldiron_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:mithril_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_axe" + } + ] }, { "type": "item", "name": "basemetals:mithril_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_boots" + } + ] }, { "type": "item", "name": "basemetals:mithril_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_chestplate" + } + ] }, { "type": "item", "name": "basemetals:mithril_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_helmet" + } + ] }, { "type": "item", "name": "basemetals:mithril_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_hoe" + } + ] }, { "type": "item", "name": "basemetals:mithril_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_leggings" + } + ] }, { "type": "item", "name": "basemetals:mithril_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:mithril_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_shovel" + } + ] }, { "type": "item", "name": "basemetals:mithril_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_sword" + } + ] }, { "type": "item", "name": "basemetals:mithril_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:aquarium_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_axe" + } + ] }, { "type": "item", "name": "basemetals:aquarium_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_boots" + } + ] }, { "type": "item", "name": "basemetals:aquarium_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_chestplate" + } + ] }, { "type": "item", "name": "basemetals:aquarium_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_helmet" + } + ] }, { "type": "item", "name": "basemetals:aquarium_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_hoe" + } + ] }, { "type": "item", "name": "basemetals:aquarium_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_leggings" + } + ] }, { "type": "item", "name": "basemetals:aquarium_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:aquarium_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_shovel" + } + ] }, { "type": "item", "name": "basemetals:aquarium_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_sword" + } + ] }, { "type": "item", "name": "basemetals:aquarium_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_crackhammer" + } + ] } ], "name": "basemetals_jungle_temple_0" @@ -609,6 +975,12 @@ "max": 6 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:silver_ingot" + } ] }, { @@ -623,6 +995,12 @@ "max": 4 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:nickel_ingot" + } ] }, { @@ -637,6 +1015,12 @@ "max": 4 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:electrum_ingot" + } ] }, { @@ -651,6 +1035,12 @@ "max": 12 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_ingot" + } ] }, { @@ -665,6 +1055,12 @@ "max": 4 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_ingot" + } ] } ], diff --git a/src/generated/resources/data/basemetals/loot_tables/chests/inject/nether_bridge.json b/src/generated/resources/data/basemetals/loot_tables/chests/inject/nether_bridge.json index 91ff99dc..fb4e9cc2 100644 --- a/src/generated/resources/data/basemetals/loot_tables/chests/inject/nether_bridge.json +++ b/src/generated/resources/data/basemetals/loot_tables/chests/inject/nether_bridge.json @@ -126,6 +126,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:iron_crackhammer" + } ] }, { @@ -138,6 +144,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_axe" + } ] }, { @@ -150,6 +162,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_boots" + } ] }, { @@ -162,6 +180,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_chestplate" + } ] }, { @@ -174,6 +198,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_helmet" + } ] }, { @@ -186,6 +216,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_hoe" + } ] }, { @@ -198,6 +234,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_leggings" + } ] }, { @@ -210,6 +252,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_pickaxe" + } ] }, { @@ -222,6 +270,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_shovel" + } ] }, { @@ -234,6 +288,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_sword" + } ] }, { @@ -246,6 +306,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_crackhammer" + } ] }, { @@ -258,6 +324,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_axe" + } ] }, { @@ -270,6 +342,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_boots" + } ] }, { @@ -282,6 +360,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_chestplate" + } ] }, { @@ -294,6 +378,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_helmet" + } ] }, { @@ -306,6 +396,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_hoe" + } ] }, { @@ -318,6 +414,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_leggings" + } ] }, { @@ -330,6 +432,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_pickaxe" + } ] }, { @@ -342,6 +450,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_shovel" + } ] }, { @@ -354,6 +468,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_sword" + } ] }, { @@ -366,207 +486,453 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_crackhammer" + } ] }, { "type": "item", "name": "basemetals:invar_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_axe" + } + ] }, { "type": "item", "name": "basemetals:invar_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_boots" + } + ] }, { "type": "item", "name": "basemetals:invar_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_chestplate" + } + ] }, { "type": "item", "name": "basemetals:invar_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_helmet" + } + ] }, { "type": "item", "name": "basemetals:invar_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_hoe" + } + ] }, { "type": "item", "name": "basemetals:invar_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_leggings" + } + ] }, { "type": "item", "name": "basemetals:invar_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:invar_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_shovel" + } + ] }, { "type": "item", "name": "basemetals:invar_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_sword" + } + ] }, { "type": "item", "name": "basemetals:invar_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:coldiron_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_axe" + } + ] }, { "type": "item", "name": "basemetals:coldiron_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_boots" + } + ] }, { "type": "item", "name": "basemetals:coldiron_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_chestplate" + } + ] }, { "type": "item", "name": "basemetals:coldiron_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_helmet" + } + ] }, { "type": "item", "name": "basemetals:coldiron_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_hoe" + } + ] }, { "type": "item", "name": "basemetals:coldiron_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_leggings" + } + ] }, { "type": "item", "name": "basemetals:coldiron_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:coldiron_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_shovel" + } + ] }, { "type": "item", "name": "basemetals:coldiron_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_sword" + } + ] }, { "type": "item", "name": "basemetals:coldiron_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:mithril_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_axe" + } + ] }, { "type": "item", "name": "basemetals:mithril_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_boots" + } + ] }, { "type": "item", "name": "basemetals:mithril_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_chestplate" + } + ] }, { "type": "item", "name": "basemetals:mithril_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_helmet" + } + ] }, { "type": "item", "name": "basemetals:mithril_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_hoe" + } + ] }, { "type": "item", "name": "basemetals:mithril_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_leggings" + } + ] }, { "type": "item", "name": "basemetals:mithril_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:mithril_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_shovel" + } + ] }, { "type": "item", "name": "basemetals:mithril_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_sword" + } + ] }, { "type": "item", "name": "basemetals:mithril_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:aquarium_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_axe" + } + ] }, { "type": "item", "name": "basemetals:aquarium_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_boots" + } + ] }, { "type": "item", "name": "basemetals:aquarium_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_chestplate" + } + ] }, { "type": "item", "name": "basemetals:aquarium_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_helmet" + } + ] }, { "type": "item", "name": "basemetals:aquarium_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_hoe" + } + ] }, { "type": "item", "name": "basemetals:aquarium_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_leggings" + } + ] }, { "type": "item", "name": "basemetals:aquarium_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:aquarium_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_shovel" + } + ] }, { "type": "item", "name": "basemetals:aquarium_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_sword" + } + ] }, { "type": "item", "name": "basemetals:aquarium_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_crackhammer" + } + ] } ], "name": "basemetals_nether_bridge_0" @@ -591,6 +957,12 @@ "max": 4 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_ingot" + } ] }, { @@ -605,6 +977,12 @@ "max": 4 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_ingot" + } ] }, { @@ -619,6 +997,12 @@ "max": 4 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_ingot" + } ] }, { @@ -633,6 +1017,12 @@ "max": 6 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:platinum_ingot" + } ] }, { @@ -647,6 +1037,12 @@ "max": 4 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:adamantine_ingot" + } ] }, { @@ -661,6 +1057,12 @@ "max": 4 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:starsteel_ingot" + } ] } ], diff --git a/src/generated/resources/data/basemetals/loot_tables/chests/inject/simple_dungeon.json b/src/generated/resources/data/basemetals/loot_tables/chests/inject/simple_dungeon.json index 5eac9449..ba3a4720 100644 --- a/src/generated/resources/data/basemetals/loot_tables/chests/inject/simple_dungeon.json +++ b/src/generated/resources/data/basemetals/loot_tables/chests/inject/simple_dungeon.json @@ -126,6 +126,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:iron_crackhammer" + } ] }, { @@ -138,6 +144,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_axe" + } ] }, { @@ -150,6 +162,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_boots" + } ] }, { @@ -162,6 +180,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_chestplate" + } ] }, { @@ -174,6 +198,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_helmet" + } ] }, { @@ -186,6 +216,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_hoe" + } ] }, { @@ -198,6 +234,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_leggings" + } ] }, { @@ -210,6 +252,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_pickaxe" + } ] }, { @@ -222,6 +270,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_shovel" + } ] }, { @@ -234,6 +288,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_sword" + } ] }, { @@ -246,6 +306,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_crackhammer" + } ] }, { @@ -258,6 +324,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_axe" + } ] }, { @@ -270,6 +342,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_boots" + } ] }, { @@ -282,6 +360,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_chestplate" + } ] }, { @@ -294,6 +378,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_helmet" + } ] }, { @@ -306,6 +396,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_hoe" + } ] }, { @@ -318,6 +414,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_leggings" + } ] }, { @@ -330,6 +432,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_pickaxe" + } ] }, { @@ -342,6 +450,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_shovel" + } ] }, { @@ -354,6 +468,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_sword" + } ] }, { @@ -366,207 +486,453 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_crackhammer" + } ] }, { "type": "item", "name": "basemetals:invar_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_axe" + } + ] }, { "type": "item", "name": "basemetals:invar_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_boots" + } + ] }, { "type": "item", "name": "basemetals:invar_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_chestplate" + } + ] }, { "type": "item", "name": "basemetals:invar_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_helmet" + } + ] }, { "type": "item", "name": "basemetals:invar_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_hoe" + } + ] }, { "type": "item", "name": "basemetals:invar_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_leggings" + } + ] }, { "type": "item", "name": "basemetals:invar_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:invar_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_shovel" + } + ] }, { "type": "item", "name": "basemetals:invar_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_sword" + } + ] }, { "type": "item", "name": "basemetals:invar_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:coldiron_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_axe" + } + ] }, { "type": "item", "name": "basemetals:coldiron_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_boots" + } + ] }, { "type": "item", "name": "basemetals:coldiron_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_chestplate" + } + ] }, { "type": "item", "name": "basemetals:coldiron_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_helmet" + } + ] }, { "type": "item", "name": "basemetals:coldiron_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_hoe" + } + ] }, { "type": "item", "name": "basemetals:coldiron_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_leggings" + } + ] }, { "type": "item", "name": "basemetals:coldiron_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:coldiron_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_shovel" + } + ] }, { "type": "item", "name": "basemetals:coldiron_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_sword" + } + ] }, { "type": "item", "name": "basemetals:coldiron_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:mithril_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_axe" + } + ] }, { "type": "item", "name": "basemetals:mithril_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_boots" + } + ] }, { "type": "item", "name": "basemetals:mithril_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_chestplate" + } + ] }, { "type": "item", "name": "basemetals:mithril_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_helmet" + } + ] }, { "type": "item", "name": "basemetals:mithril_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_hoe" + } + ] }, { "type": "item", "name": "basemetals:mithril_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_leggings" + } + ] }, { "type": "item", "name": "basemetals:mithril_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:mithril_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_shovel" + } + ] }, { "type": "item", "name": "basemetals:mithril_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_sword" + } + ] }, { "type": "item", "name": "basemetals:mithril_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:aquarium_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_axe" + } + ] }, { "type": "item", "name": "basemetals:aquarium_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_boots" + } + ] }, { "type": "item", "name": "basemetals:aquarium_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_chestplate" + } + ] }, { "type": "item", "name": "basemetals:aquarium_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_helmet" + } + ] }, { "type": "item", "name": "basemetals:aquarium_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_hoe" + } + ] }, { "type": "item", "name": "basemetals:aquarium_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_leggings" + } + ] }, { "type": "item", "name": "basemetals:aquarium_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:aquarium_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_shovel" + } + ] }, { "type": "item", "name": "basemetals:aquarium_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_sword" + } + ] }, { "type": "item", "name": "basemetals:aquarium_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_crackhammer" + } + ] } ], "name": "basemetals_simple_dungeon_0" @@ -609,6 +975,12 @@ "max": 6 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:silver_ingot" + } ] }, { @@ -623,6 +995,12 @@ "max": 4 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:nickel_ingot" + } ] }, { @@ -637,6 +1015,12 @@ "max": 4 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:electrum_ingot" + } ] }, { @@ -651,6 +1035,12 @@ "max": 12 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_ingot" + } ] }, { @@ -665,6 +1055,12 @@ "max": 4 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_ingot" + } ] } ], diff --git a/src/generated/resources/data/basemetals/loot_tables/chests/inject/spawn_bonus_chest.json b/src/generated/resources/data/basemetals/loot_tables/chests/inject/spawn_bonus_chest.json index f79aa079..c6f2fbbb 100644 --- a/src/generated/resources/data/basemetals/loot_tables/chests/inject/spawn_bonus_chest.json +++ b/src/generated/resources/data/basemetals/loot_tables/chests/inject/spawn_bonus_chest.json @@ -52,207 +52,453 @@ { "type": "item", "name": "basemetals:iron_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:iron_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:tin_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_axe" + } + ] }, { "type": "item", "name": "basemetals:tin_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_boots" + } + ] }, { "type": "item", "name": "basemetals:tin_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_chestplate" + } + ] }, { "type": "item", "name": "basemetals:tin_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_helmet" + } + ] }, { "type": "item", "name": "basemetals:tin_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_hoe" + } + ] }, { "type": "item", "name": "basemetals:tin_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_leggings" + } + ] }, { "type": "item", "name": "basemetals:tin_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:tin_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_shovel" + } + ] }, { "type": "item", "name": "basemetals:tin_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_sword" + } + ] }, { "type": "item", "name": "basemetals:tin_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:copper_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_axe" + } + ] }, { "type": "item", "name": "basemetals:copper_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_boots" + } + ] }, { "type": "item", "name": "basemetals:copper_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_chestplate" + } + ] }, { "type": "item", "name": "basemetals:copper_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_helmet" + } + ] }, { "type": "item", "name": "basemetals:copper_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_hoe" + } + ] }, { "type": "item", "name": "basemetals:copper_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_leggings" + } + ] }, { "type": "item", "name": "basemetals:copper_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:copper_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_shovel" + } + ] }, { "type": "item", "name": "basemetals:copper_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_sword" + } + ] }, { "type": "item", "name": "basemetals:copper_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:bronze_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_axe" + } + ] }, { "type": "item", "name": "basemetals:bronze_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_boots" + } + ] }, { "type": "item", "name": "basemetals:bronze_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_chestplate" + } + ] }, { "type": "item", "name": "basemetals:bronze_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_helmet" + } + ] }, { "type": "item", "name": "basemetals:bronze_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_hoe" + } + ] }, { "type": "item", "name": "basemetals:bronze_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_leggings" + } + ] }, { "type": "item", "name": "basemetals:bronze_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:bronze_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_shovel" + } + ] }, { "type": "item", "name": "basemetals:bronze_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_sword" + } + ] }, { "type": "item", "name": "basemetals:bronze_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:steel_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_axe" + } + ] }, { "type": "item", "name": "basemetals:steel_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_boots" + } + ] }, { "type": "item", "name": "basemetals:steel_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_chestplate" + } + ] }, { "type": "item", "name": "basemetals:steel_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_helmet" + } + ] }, { "type": "item", "name": "basemetals:steel_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_hoe" + } + ] }, { "type": "item", "name": "basemetals:steel_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_leggings" + } + ] }, { "type": "item", "name": "basemetals:steel_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:steel_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_shovel" + } + ] }, { "type": "item", "name": "basemetals:steel_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_sword" + } + ] }, { "type": "item", "name": "basemetals:steel_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_crackhammer" + } + ] } ], "name": "basemetals_spawn_bonus_chest_0" diff --git a/src/generated/resources/data/basemetals/loot_tables/chests/inject/stronghold_corridor.json b/src/generated/resources/data/basemetals/loot_tables/chests/inject/stronghold_corridor.json index f8201067..1787ba25 100644 --- a/src/generated/resources/data/basemetals/loot_tables/chests/inject/stronghold_corridor.json +++ b/src/generated/resources/data/basemetals/loot_tables/chests/inject/stronghold_corridor.json @@ -126,6 +126,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:iron_crackhammer" + } ] }, { @@ -138,6 +144,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_axe" + } ] }, { @@ -150,6 +162,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_boots" + } ] }, { @@ -162,6 +180,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_chestplate" + } ] }, { @@ -174,6 +198,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_helmet" + } ] }, { @@ -186,6 +216,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_hoe" + } ] }, { @@ -198,6 +234,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_leggings" + } ] }, { @@ -210,6 +252,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_pickaxe" + } ] }, { @@ -222,6 +270,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_shovel" + } ] }, { @@ -234,6 +288,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_sword" + } ] }, { @@ -246,6 +306,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_crackhammer" + } ] }, { @@ -258,6 +324,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_axe" + } ] }, { @@ -270,6 +342,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_boots" + } ] }, { @@ -282,6 +360,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_chestplate" + } ] }, { @@ -294,6 +378,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_helmet" + } ] }, { @@ -306,6 +396,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_hoe" + } ] }, { @@ -318,6 +414,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_leggings" + } ] }, { @@ -330,6 +432,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_pickaxe" + } ] }, { @@ -342,6 +450,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_shovel" + } ] }, { @@ -354,6 +468,12 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_sword" + } ] }, { @@ -366,207 +486,453 @@ "levels": 10, "treasure": true } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_crackhammer" + } ] }, { "type": "item", "name": "basemetals:invar_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_axe" + } + ] }, { "type": "item", "name": "basemetals:invar_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_boots" + } + ] }, { "type": "item", "name": "basemetals:invar_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_chestplate" + } + ] }, { "type": "item", "name": "basemetals:invar_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_helmet" + } + ] }, { "type": "item", "name": "basemetals:invar_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_hoe" + } + ] }, { "type": "item", "name": "basemetals:invar_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_leggings" + } + ] }, { "type": "item", "name": "basemetals:invar_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:invar_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_shovel" + } + ] }, { "type": "item", "name": "basemetals:invar_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_sword" + } + ] }, { "type": "item", "name": "basemetals:invar_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:coldiron_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_axe" + } + ] }, { "type": "item", "name": "basemetals:coldiron_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_boots" + } + ] }, { "type": "item", "name": "basemetals:coldiron_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_chestplate" + } + ] }, { "type": "item", "name": "basemetals:coldiron_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_helmet" + } + ] }, { "type": "item", "name": "basemetals:coldiron_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_hoe" + } + ] }, { "type": "item", "name": "basemetals:coldiron_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_leggings" + } + ] }, { "type": "item", "name": "basemetals:coldiron_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:coldiron_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_shovel" + } + ] }, { "type": "item", "name": "basemetals:coldiron_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_sword" + } + ] }, { "type": "item", "name": "basemetals:coldiron_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:mithril_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_axe" + } + ] }, { "type": "item", "name": "basemetals:mithril_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_boots" + } + ] }, { "type": "item", "name": "basemetals:mithril_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_chestplate" + } + ] }, { "type": "item", "name": "basemetals:mithril_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_helmet" + } + ] }, { "type": "item", "name": "basemetals:mithril_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_hoe" + } + ] }, { "type": "item", "name": "basemetals:mithril_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_leggings" + } + ] }, { "type": "item", "name": "basemetals:mithril_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:mithril_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_shovel" + } + ] }, { "type": "item", "name": "basemetals:mithril_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_sword" + } + ] }, { "type": "item", "name": "basemetals:mithril_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:aquarium_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_axe" + } + ] }, { "type": "item", "name": "basemetals:aquarium_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_boots" + } + ] }, { "type": "item", "name": "basemetals:aquarium_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_chestplate" + } + ] }, { "type": "item", "name": "basemetals:aquarium_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_helmet" + } + ] }, { "type": "item", "name": "basemetals:aquarium_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_hoe" + } + ] }, { "type": "item", "name": "basemetals:aquarium_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_leggings" + } + ] }, { "type": "item", "name": "basemetals:aquarium_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:aquarium_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_shovel" + } + ] }, { "type": "item", "name": "basemetals:aquarium_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_sword" + } + ] }, { "type": "item", "name": "basemetals:aquarium_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_crackhammer" + } + ] } ], "name": "basemetals_stronghold_corridor_0" @@ -591,6 +957,12 @@ "max": 4 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:coldiron_ingot" + } ] }, { @@ -605,6 +977,12 @@ "max": 4 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:aquarium_ingot" + } ] }, { @@ -619,6 +997,12 @@ "max": 4 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:mithril_ingot" + } ] }, { @@ -633,6 +1017,12 @@ "max": 6 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:platinum_ingot" + } ] }, { @@ -647,6 +1037,12 @@ "max": 4 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:adamantine_ingot" + } ] }, { @@ -661,6 +1057,12 @@ "max": 4 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:starsteel_ingot" + } ] } ], diff --git a/src/generated/resources/data/basemetals/loot_tables/chests/inject/stronghold_crossing.json b/src/generated/resources/data/basemetals/loot_tables/chests/inject/stronghold_crossing.json index 6ed8a609..12047959 100644 --- a/src/generated/resources/data/basemetals/loot_tables/chests/inject/stronghold_crossing.json +++ b/src/generated/resources/data/basemetals/loot_tables/chests/inject/stronghold_crossing.json @@ -56,207 +56,453 @@ { "type": "item", "name": "basemetals:iron_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:iron_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:tin_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_axe" + } + ] }, { "type": "item", "name": "basemetals:tin_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_boots" + } + ] }, { "type": "item", "name": "basemetals:tin_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_chestplate" + } + ] }, { "type": "item", "name": "basemetals:tin_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_helmet" + } + ] }, { "type": "item", "name": "basemetals:tin_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_hoe" + } + ] }, { "type": "item", "name": "basemetals:tin_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_leggings" + } + ] }, { "type": "item", "name": "basemetals:tin_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:tin_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_shovel" + } + ] }, { "type": "item", "name": "basemetals:tin_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_sword" + } + ] }, { "type": "item", "name": "basemetals:tin_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:copper_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_axe" + } + ] }, { "type": "item", "name": "basemetals:copper_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_boots" + } + ] }, { "type": "item", "name": "basemetals:copper_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_chestplate" + } + ] }, { "type": "item", "name": "basemetals:copper_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_helmet" + } + ] }, { "type": "item", "name": "basemetals:copper_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_hoe" + } + ] }, { "type": "item", "name": "basemetals:copper_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_leggings" + } + ] }, { "type": "item", "name": "basemetals:copper_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:copper_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_shovel" + } + ] }, { "type": "item", "name": "basemetals:copper_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_sword" + } + ] }, { "type": "item", "name": "basemetals:copper_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:bronze_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_axe" + } + ] }, { "type": "item", "name": "basemetals:bronze_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_boots" + } + ] }, { "type": "item", "name": "basemetals:bronze_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_chestplate" + } + ] }, { "type": "item", "name": "basemetals:bronze_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_helmet" + } + ] }, { "type": "item", "name": "basemetals:bronze_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_hoe" + } + ] }, { "type": "item", "name": "basemetals:bronze_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_leggings" + } + ] }, { "type": "item", "name": "basemetals:bronze_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:bronze_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_shovel" + } + ] }, { "type": "item", "name": "basemetals:bronze_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_sword" + } + ] }, { "type": "item", "name": "basemetals:bronze_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:steel_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_axe" + } + ] }, { "type": "item", "name": "basemetals:steel_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_boots" + } + ] }, { "type": "item", "name": "basemetals:steel_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_chestplate" + } + ] }, { "type": "item", "name": "basemetals:steel_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_helmet" + } + ] }, { "type": "item", "name": "basemetals:steel_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_hoe" + } + ] }, { "type": "item", "name": "basemetals:steel_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_leggings" + } + ] }, { "type": "item", "name": "basemetals:steel_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:steel_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_shovel" + } + ] }, { "type": "item", "name": "basemetals:steel_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_sword" + } + ] }, { "type": "item", "name": "basemetals:steel_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_crackhammer" + } + ] } ], "name": "basemetals_stronghold_crossing_0" @@ -299,6 +545,12 @@ "max": 6 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:silver_ingot" + } ] }, { @@ -313,6 +565,12 @@ "max": 4 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:nickel_ingot" + } ] }, { @@ -327,6 +585,12 @@ "max": 4 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:electrum_ingot" + } ] }, { @@ -341,6 +605,12 @@ "max": 12 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_ingot" + } ] }, { @@ -355,6 +625,12 @@ "max": 4 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:invar_ingot" + } ] } ], diff --git a/src/generated/resources/data/basemetals/loot_tables/chests/inject/village_blacksmith.json b/src/generated/resources/data/basemetals/loot_tables/chests/inject/village_blacksmith.json index 8bf1c2bb..f19e174b 100644 --- a/src/generated/resources/data/basemetals/loot_tables/chests/inject/village_blacksmith.json +++ b/src/generated/resources/data/basemetals/loot_tables/chests/inject/village_blacksmith.json @@ -56,207 +56,453 @@ { "type": "item", "name": "basemetals:iron_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:iron_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:tin_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_axe" + } + ] }, { "type": "item", "name": "basemetals:tin_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_boots" + } + ] }, { "type": "item", "name": "basemetals:tin_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_chestplate" + } + ] }, { "type": "item", "name": "basemetals:tin_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_helmet" + } + ] }, { "type": "item", "name": "basemetals:tin_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_hoe" + } + ] }, { "type": "item", "name": "basemetals:tin_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_leggings" + } + ] }, { "type": "item", "name": "basemetals:tin_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:tin_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_shovel" + } + ] }, { "type": "item", "name": "basemetals:tin_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_sword" + } + ] }, { "type": "item", "name": "basemetals:tin_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:copper_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_axe" + } + ] }, { "type": "item", "name": "basemetals:copper_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_boots" + } + ] }, { "type": "item", "name": "basemetals:copper_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_chestplate" + } + ] }, { "type": "item", "name": "basemetals:copper_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_helmet" + } + ] }, { "type": "item", "name": "basemetals:copper_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_hoe" + } + ] }, { "type": "item", "name": "basemetals:copper_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_leggings" + } + ] }, { "type": "item", "name": "basemetals:copper_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:copper_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_shovel" + } + ] }, { "type": "item", "name": "basemetals:copper_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_sword" + } + ] }, { "type": "item", "name": "basemetals:copper_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:bronze_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_axe" + } + ] }, { "type": "item", "name": "basemetals:bronze_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_boots" + } + ] }, { "type": "item", "name": "basemetals:bronze_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_chestplate" + } + ] }, { "type": "item", "name": "basemetals:bronze_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_helmet" + } + ] }, { "type": "item", "name": "basemetals:bronze_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_hoe" + } + ] }, { "type": "item", "name": "basemetals:bronze_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_leggings" + } + ] }, { "type": "item", "name": "basemetals:bronze_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:bronze_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_shovel" + } + ] }, { "type": "item", "name": "basemetals:bronze_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_sword" + } + ] }, { "type": "item", "name": "basemetals:bronze_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_crackhammer" + } + ] }, { "type": "item", "name": "basemetals:steel_axe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_axe" + } + ] }, { "type": "item", "name": "basemetals:steel_boots", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_boots" + } + ] }, { "type": "item", "name": "basemetals:steel_chestplate", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_chestplate" + } + ] }, { "type": "item", "name": "basemetals:steel_helmet", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_helmet" + } + ] }, { "type": "item", "name": "basemetals:steel_hoe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_hoe" + } + ] }, { "type": "item", "name": "basemetals:steel_leggings", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_leggings" + } + ] }, { "type": "item", "name": "basemetals:steel_pickaxe", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_pickaxe" + } + ] }, { "type": "item", "name": "basemetals:steel_shovel", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_shovel" + } + ] }, { "type": "item", "name": "basemetals:steel_sword", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_sword" + } + ] }, { "type": "item", "name": "basemetals:steel_crackhammer", - "weight": 3 + "weight": 3, + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:steel_crackhammer" + } + ] } ], "name": "basemetals_village_blacksmith_0" @@ -299,6 +545,12 @@ "max": 6 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:tin_ingot" + } ] }, { @@ -313,6 +565,12 @@ "max": 6 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:lead_ingot" + } ] }, { @@ -327,6 +585,12 @@ "max": 6 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:zinc_ingot" + } ] }, { @@ -341,6 +605,12 @@ "max": 6 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:copper_ingot" + } ] }, { @@ -355,6 +625,12 @@ "max": 6 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:brass_ingot" + } ] }, { @@ -369,6 +645,12 @@ "max": 6 } } + ], + "conditions": [ + { + "condition": "basemetals:content_mode", + "item": "basemetals:bronze_ingot" + } ] } ], diff --git a/src/generated/resources/data/basemetals/recipes/activator_rail.json b/src/generated/resources/data/basemetals/recipes/activator_rail.json index 49f47b21..7d71a86b 100644 --- a/src/generated/resources/data/basemetals/recipes/activator_rail.json +++ b/src/generated/resources/data/basemetals/recipes/activator_rail.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XSX", - "XRX", - "XSX" - ], - "key": { - "R": { - "item": "minecraft:redstone_torch" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XSX", + "XRX", + "XSX" + ], + "key": { + "R": { + "item": "minecraft:redstone_torch" + }, + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/steel" + } }, - "S": { - "tag": "forge:rods/wooden" + "result": { + "item": "minecraft:activator_rail" }, - "X": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "minecraft:activator_rail" - }, - "group": "minecraft:activator_rail" + "group": "minecraft:activator_rail" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_anvil.json b/src/generated/resources/data/basemetals/recipes/adamantine_anvil.json index 5e1deb41..5a2827e7 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_anvil.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_anvil.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "BBB", - " B ", - "III" - ], - "key": { - "B": { - "tag": "forge:storage_blocks/adamantine" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "BBB", + " B ", + "III" + ], + "key": { + "B": { + "tag": "forge:storage_blocks/adamantine" + }, + "I": { + "tag": "forge:ingots/adamantine" + } }, - "I": { - "tag": "forge:ingots/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_anvil" - }, - "group": "basemetals:adamantine_anvil" + "result": { + "item": "basemetals:adamantine_anvil" + }, + "group": "basemetals:adamantine_anvil" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_arrow.json b/src/generated/resources/data/basemetals/recipes/adamantine_arrow.json index 666d337b..70c22eba 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_arrow.json @@ -1,24 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "N", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "N", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "N": { + "tag": "forge:nuggets/adamantine" + }, + "R": { + "tag": "forge:rods/adamantine" + } }, - "N": { - "tag": "forge:nuggets/adamantine" + "result": { + "item": "basemetals:adamantine_arrow", + "count": 4 }, - "R": { - "tag": "forge:rods/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_arrow", - "count": 4 - }, - "group": "basemetals:adamantine_arrow" + "group": "basemetals:adamantine_arrow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_axe.json b/src/generated/resources/data/basemetals/recipes/adamantine_axe.json index cb3c2e90..210ccc76 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_axe.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_axe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XS", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XS", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/adamantine" + } }, - "X": { - "tag": "forge:ingots/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_axe" - }, - "group": "basemetals:adamantine_axe" + "result": { + "item": "basemetals:adamantine_axe" + }, + "group": "basemetals:adamantine_axe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_bars.json b/src/generated/resources/data/basemetals/recipes/adamantine_bars.json index 353c009a..df30a6c2 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_bars.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_bars.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_bars", - "count": 16 - }, - "group": "basemetals:adamantine_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/adamantine" + } + }, + "result": { + "item": "basemetals:adamantine_bars", + "count": 16 + }, + "group": "basemetals:adamantine_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_bars_2.json b/src/generated/resources/data/basemetals/recipes/adamantine_bars_2.json index 782ba59f..80f212e9 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_bars_2.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:rods/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_bars", - "count": 4 - }, - "group": "basemetals:adamantine_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:rods/adamantine" + } + }, + "result": { + "item": "basemetals:adamantine_bars", + "count": 4 + }, + "group": "basemetals:adamantine_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_block.json b/src/generated/resources/data/basemetals/recipes/adamantine_block.json index b67055cc..87ea65f0 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_block.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_block.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_block" - }, - "group": "basemetals:adamantine_block" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/adamantine" + } + }, + "result": { + "item": "basemetals:adamantine_block" + }, + "group": "basemetals:adamantine_block" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_block_ingot.json b/src/generated/resources/data/basemetals/recipes/adamantine_block_ingot.json index 41aeec49..8ff2df70 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_block_ingot.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/adamantine" - } - ], - "result": { - "item": "basemetals:adamantine_ingot", - "count": 9 - }, - "group": "basemetals:adamantine_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/adamantine" + } + ], + "result": { + "item": "basemetals:adamantine_ingot", + "count": 9 + }, + "group": "basemetals:adamantine_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_bolt.json b/src/generated/resources/data/basemetals/recipes/adamantine_bolt.json index 454d7bdf..5a29f1ea 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_bolt.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "R": { + "tag": "forge:rods/adamantine" + } }, - "R": { - "tag": "forge:rods/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_bolt", - "count": 4 - }, - "group": "basemetals:adamantine_bolt" + "result": { + "item": "basemetals:adamantine_bolt", + "count": 4 + }, + "group": "basemetals:adamantine_bolt" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_boots.json b/src/generated/resources/data/basemetals/recipes/adamantine_boots.json index 6a00ffa1..46a92998 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_boots.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_boots.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_boots" - }, - "group": "basemetals:adamantine_boots" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/adamantine" + } + }, + "result": { + "item": "basemetals:adamantine_boots" + }, + "group": "basemetals:adamantine_boots" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_bow.json b/src/generated/resources/data/basemetals/recipes/adamantine_bow.json index 57904be5..45dad7a0 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_bow.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_bow.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " RS", - "R S", - " RS" - ], - "key": { - "R": { - "tag": "forge:rods/adamantine" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " RS", + "R S", + " RS" + ], + "key": { + "R": { + "tag": "forge:rods/adamantine" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:adamantine_bow" - }, - "group": "basemetals:adamantine_bow" + "result": { + "item": "basemetals:adamantine_bow" + }, + "group": "basemetals:adamantine_bow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_button.json b/src/generated/resources/data/basemetals/recipes/adamantine_button.json index edc4b2ad..6f1ae094 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_button.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_button.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:nuggets/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_button" - }, - "group": "basemetals:adamantine_button" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:nuggets/adamantine" + } + }, + "result": { + "item": "basemetals:adamantine_button" + }, + "group": "basemetals:adamantine_button" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_chestplate.json b/src/generated/resources/data/basemetals/recipes/adamantine_chestplate.json index 6968afb2..c6c37ad0 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_chestplate.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_chestplate" - }, - "group": "basemetals:adamantine_chestplate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/adamantine" + } + }, + "result": { + "item": "basemetals:adamantine_chestplate" + }, + "group": "basemetals:adamantine_chestplate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_crackhammer.json b/src/generated/resources/data/basemetals/recipes/adamantine_crackhammer.json index 10e4b525..4741e102 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:storage_blocks/adamantine" + } }, - "X": { - "tag": "forge:storage_blocks/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_crackhammer" - }, - "group": "basemetals:adamantine_crackhammer" + "result": { + "item": "basemetals:adamantine_crackhammer" + }, + "group": "basemetals:adamantine_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_crossbow.json b/src/generated/resources/data/basemetals/recipes/adamantine_crossbow.json index dd015c57..a42f2400 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_crossbow.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRR", - " SR", - "R G" - ], - "key": { - "G": { - "tag": "forge:gears/adamantine" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRR", + " SR", + "R G" + ], + "key": { + "G": { + "tag": "forge:gears/adamantine" + }, + "R": { + "tag": "forge:rods/adamantine" + }, + "S": { + "item": "minecraft:string" + } }, - "R": { - "tag": "forge:rods/adamantine" + "result": { + "item": "basemetals:adamantine_crossbow" }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:adamantine_crossbow" - }, - "group": "basemetals:adamantine_crossbow" + "group": "basemetals:adamantine_crossbow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_door.json b/src/generated/resources/data/basemetals/recipes/adamantine_door.json index eacc47d9..04bf6975 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_door.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_door.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_door", - "count": 3 - }, - "group": "basemetals:adamantine_door" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/adamantine" + } + }, + "result": { + "item": "basemetals:adamantine_door", + "count": 3 + }, + "group": "basemetals:adamantine_door" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_fishingrod.json b/src/generated/resources/data/basemetals/recipes/adamantine_fishingrod.json index 0392479d..57bb50cd 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_fishingrod.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " R", - " RS", - "R S" - ], - "key": { - "R": { - "tag": "forge:rods/adamantine" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " R", + " RS", + "R S" + ], + "key": { + "R": { + "tag": "forge:rods/adamantine" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:adamantine_fishing_rod" - }, - "group": "basemetals:adamantine_fishing_rod" + "result": { + "item": "basemetals:adamantine_fishing_rod" + }, + "group": "basemetals:adamantine_fishing_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_gear.json b/src/generated/resources/data/basemetals/recipes/adamantine_gear.json index b070f51d..b1f941fd 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_gear.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_gear.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "XRX", - " X " - ], - "key": { - "R": { - "tag": "forge:rods/adamantine" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XRX", + " X " + ], + "key": { + "R": { + "tag": "forge:rods/adamantine" + }, + "X": { + "tag": "forge:ingots/adamantine" + } }, - "X": { - "tag": "forge:ingots/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_gear", - "count": 4 - }, - "group": "basemetals:adamantine_gear" + "result": { + "item": "basemetals:adamantine_gear", + "count": 4 + }, + "group": "basemetals:adamantine_gear" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_helmet.json b/src/generated/resources/data/basemetals/recipes/adamantine_helmet.json index 6568939e..39d3c99f 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_helmet.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_helmet" - }, - "group": "basemetals:adamantine_helmet" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/adamantine" + } + }, + "result": { + "item": "basemetals:adamantine_helmet" + }, + "group": "basemetals:adamantine_helmet" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_hoe.json b/src/generated/resources/data/basemetals/recipes/adamantine_hoe.json index 3941b01f..b6006629 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_hoe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - " S", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " S", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/adamantine" + } }, - "X": { - "tag": "forge:ingots/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_hoe" - }, - "group": "basemetals:adamantine_hoe" + "result": { + "item": "basemetals:adamantine_hoe" + }, + "group": "basemetals:adamantine_hoe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_horsearmor.json b/src/generated/resources/data/basemetals/recipes/adamantine_horsearmor.json index 92797eb6..ffeeaf2f 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_horsearmor.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "XWX", - "XXX" - ], - "key": { - "W": { - "tag": "minecraft:wool" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "XWX", + "XXX" + ], + "key": { + "W": { + "tag": "minecraft:wool" + }, + "X": { + "tag": "forge:ingots/adamantine" + } }, - "X": { - "tag": "forge:ingots/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_horse_armor" - }, - "group": "basemetals:adamantine_horse_armor" + "result": { + "item": "basemetals:adamantine_horse_armor" + }, + "group": "basemetals:adamantine_horse_armor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/adamantine_ingot_from_nuggets.json index 7353c0bc..f81f033d 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_ingot_from_nuggets.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:nuggets/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_ingot" - }, - "group": "basemetals:adamantine_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:nuggets/adamantine" + } + }, + "result": { + "item": "basemetals:adamantine_ingot" + }, + "group": "basemetals:adamantine_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_leggings.json b/src/generated/resources/data/basemetals/recipes/adamantine_leggings.json index d50e3e8c..c36ab831 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_leggings.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_leggings" - }, - "group": "basemetals:adamantine_leggings" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/adamantine" + } + }, + "result": { + "item": "basemetals:adamantine_leggings" + }, + "group": "basemetals:adamantine_leggings" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_lever.json b/src/generated/resources/data/basemetals/recipes/adamantine_lever.json index 664cb2fa..d3698ae8 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_lever.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_lever.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "X" - ], - "key": { - "R": { - "tag": "forge:rods/adamantine" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "X" + ], + "key": { + "R": { + "tag": "forge:rods/adamantine" + }, + "X": { + "tag": "forge:ingots/adamantine" + } }, - "X": { - "tag": "forge:ingots/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_lever" - }, - "group": "basemetals:adamantine_lever" + "result": { + "item": "basemetals:adamantine_lever" + }, + "group": "basemetals:adamantine_lever" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_nuggets.json b/src/generated/resources/data/basemetals/recipes/adamantine_nuggets.json index a84e61cb..6cd7bf93 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_nuggets.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:ingots/adamantine" - } - ], - "result": { - "item": "basemetals:adamantine_nugget", - "count": 9 - }, - "group": "basemetals:adamantine_nugget" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/adamantine" + } + ], + "result": { + "item": "basemetals:adamantine_nugget", + "count": 9 + }, + "group": "basemetals:adamantine_nugget" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_pickaxe.json b/src/generated/resources/data/basemetals/recipes/adamantine_pickaxe.json index c48eff47..a0c654dc 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_pickaxe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " S ", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " S ", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/adamantine" + } }, - "X": { - "tag": "forge:ingots/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_pickaxe" - }, - "group": "basemetals:adamantine_pickaxe" + "result": { + "item": "basemetals:adamantine_pickaxe" + }, + "group": "basemetals:adamantine_pickaxe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_plate.json b/src/generated/resources/data/basemetals/recipes/adamantine_plate.json index 24050ea9..de347308 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_plate.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_plate.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_plate", - "count": 3 - }, - "group": "basemetals:adamantine_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/adamantine" + } + }, + "result": { + "item": "basemetals:adamantine_plate", + "count": 3 + }, + "group": "basemetals:adamantine_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/adamantine_powder_from_small.json index e51582b5..c3826968 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_powder" - }, - "group": "basemetals:adamantine_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/adamantine" + } + }, + "result": { + "item": "basemetals:adamantine_powder" + }, + "group": "basemetals:adamantine_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/adamantine_pressure_plate.json index 9ee6beec..f7bdb820 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_pressure_plate.json @@ -1,15 +1,18 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_pressure_plate" - }, - "group": "basemetals:adamantine_pressure_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/adamantine" + } + }, + "result": { + "item": "basemetals:adamantine_pressure_plate" + }, + "group": "basemetals:adamantine_pressure_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_rod.json b/src/generated/resources/data/basemetals/recipes/adamantine_rod.json index fffc2434..296fdcc9 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_rod.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_rod.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:ingots/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_rod", - "count": 4 - }, - "group": "basemetals:adamantine_rod" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:ingots/adamantine" + } + }, + "result": { + "item": "basemetals:adamantine_rod", + "count": 4 + }, + "group": "basemetals:adamantine_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_scythe.json b/src/generated/resources/data/basemetals/recipes/adamantine_scythe.json index 2f4ed9b3..8f335e4c 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/adamantine" + } }, - "X": { - "tag": "forge:ingots/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_scythe" - }, - "group": "basemetals:adamantine_scythe" + "result": { + "item": "basemetals:adamantine_scythe" + }, + "group": "basemetals:adamantine_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_shears.json b/src/generated/resources/data/basemetals/recipes/adamantine_shears.json index f892e8ad..61c55df9 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_shears.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_shears.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "X " - ], - "key": { - "X": { - "tag": "forge:ingots/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_shears" - }, - "group": "basemetals:adamantine_shears" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "X " + ], + "key": { + "X": { + "tag": "forge:ingots/adamantine" + } + }, + "result": { + "item": "basemetals:adamantine_shears" + }, + "group": "basemetals:adamantine_shears" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_shield.json b/src/generated/resources/data/basemetals/recipes/adamantine_shield.json index d4a29aa9..d1f634a8 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_shield.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_shield.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XWX", - "XXX", - " X " - ], - "key": { - "W": { - "tag": "minecraft:planks" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XWX", + "XXX", + " X " + ], + "key": { + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:ingots/adamantine" + } }, - "X": { - "tag": "forge:ingots/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_shield" - }, - "group": "basemetals:adamantine_shield" + "result": { + "item": "basemetals:adamantine_shield" + }, + "group": "basemetals:adamantine_shield" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_shovel.json b/src/generated/resources/data/basemetals/recipes/adamantine_shovel.json index b0b17624..3c95fb08 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_shovel.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/adamantine" + } }, - "X": { - "tag": "forge:ingots/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_shovel" - }, - "group": "basemetals:adamantine_shovel" + "result": { + "item": "basemetals:adamantine_shovel" + }, + "group": "basemetals:adamantine_shovel" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_slab.json b/src/generated/resources/data/basemetals/recipes/adamantine_slab.json index f6dfca42..010871a8 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_slab.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_slab.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_slab", - "count": 6 - }, - "group": "basemetals:adamantine_slab" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/adamantine" + } + }, + "result": { + "item": "basemetals:adamantine_slab", + "count": 6 + }, + "group": "basemetals:adamantine_slab" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_smallpowder.json b/src/generated/resources/data/basemetals/recipes/adamantine_smallpowder.json index 3598e512..b2b6cb11 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/adamantine" - } - ], - "result": { - "item": "basemetals:adamantine_smallpowder", - "count": 9 - }, - "group": "basemetals:adamantine_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/adamantine" + } + ], + "result": { + "item": "basemetals:adamantine_smallpowder", + "count": 9 + }, + "group": "basemetals:adamantine_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_stairs.json b/src/generated/resources/data/basemetals/recipes/adamantine_stairs.json index 4fe240db..e7bcda6e 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_stairs.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X ", - "XX ", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_stairs", - "count": 4 - }, - "group": "basemetals:adamantine_stairs" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/adamantine" + } + }, + "result": { + "item": "basemetals:adamantine_stairs", + "count": 4 + }, + "group": "basemetals:adamantine_stairs" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_sword.json b/src/generated/resources/data/basemetals/recipes/adamantine_sword.json index a9f5228e..40bc061d 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_sword.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_sword.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/adamantine" + } }, - "X": { - "tag": "forge:ingots/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_sword" - }, - "group": "basemetals:adamantine_sword" + "result": { + "item": "basemetals:adamantine_sword" + }, + "group": "basemetals:adamantine_sword" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_trapdoor.json b/src/generated/resources/data/basemetals/recipes/adamantine_trapdoor.json index b00e84fb..9bc9aaa2 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_trapdoor.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_trapdoor" - }, - "group": "basemetals:adamantine_trapdoor" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/adamantine" + } + }, + "result": { + "item": "basemetals:adamantine_trapdoor" + }, + "group": "basemetals:adamantine_trapdoor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/adamantine_wall.json b/src/generated/resources/data/basemetals/recipes/adamantine_wall.json index 796f7b0b..a08dfea3 100644 --- a/src/generated/resources/data/basemetals/recipes/adamantine_wall.json +++ b/src/generated/resources/data/basemetals/recipes/adamantine_wall.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/adamantine" - } - }, - "result": { - "item": "basemetals:adamantine_wall", - "count": 6 - }, - "group": "basemetals:adamantine_wall" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/adamantine" + } + }, + "result": { + "item": "basemetals:adamantine_wall", + "count": 6 + }, + "group": "basemetals:adamantine_wall" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_arrow.json b/src/generated/resources/data/basemetals/recipes/antimony_arrow.json index 1d5d166a..d4e3df25 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_arrow.json @@ -1,24 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "N", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "N", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "N": { + "tag": "forge:nuggets/antimony" + }, + "R": { + "tag": "forge:rods/antimony" + } }, - "N": { - "tag": "forge:nuggets/antimony" + "result": { + "item": "basemetals:antimony_arrow", + "count": 4 }, - "R": { - "tag": "forge:rods/antimony" - } - }, - "result": { - "item": "basemetals:antimony_arrow", - "count": 4 - }, - "group": "basemetals:antimony_arrow" + "group": "basemetals:antimony_arrow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_axe.json b/src/generated/resources/data/basemetals/recipes/antimony_axe.json index 2ee022ee..f2fb6f15 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_axe.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_axe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XS", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XS", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/antimony" + } }, - "X": { - "tag": "forge:ingots/antimony" - } - }, - "result": { - "item": "basemetals:antimony_axe" - }, - "group": "basemetals:antimony_axe" + "result": { + "item": "basemetals:antimony_axe" + }, + "group": "basemetals:antimony_axe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_bars.json b/src/generated/resources/data/basemetals/recipes/antimony_bars.json index 4c0a4bb5..2d2b68df 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_bars.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_bars.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/antimony" - } - }, - "result": { - "item": "basemetals:antimony_bars", - "count": 16 - }, - "group": "basemetals:antimony_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/antimony" + } + }, + "result": { + "item": "basemetals:antimony_bars", + "count": 16 + }, + "group": "basemetals:antimony_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_bars_2.json b/src/generated/resources/data/basemetals/recipes/antimony_bars_2.json index 7f442ea4..e454b69b 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_bars_2.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:rods/antimony" - } - }, - "result": { - "item": "basemetals:antimony_bars", - "count": 4 - }, - "group": "basemetals:antimony_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:rods/antimony" + } + }, + "result": { + "item": "basemetals:antimony_bars", + "count": 4 + }, + "group": "basemetals:antimony_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_block.json b/src/generated/resources/data/basemetals/recipes/antimony_block.json index 4c445bdc..9c5eb09e 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_block.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_block.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/antimony" - } - }, - "result": { - "item": "basemetals:antimony_block" - }, - "group": "basemetals:antimony_block" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/antimony" + } + }, + "result": { + "item": "basemetals:antimony_block" + }, + "group": "basemetals:antimony_block" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_block_ingot.json b/src/generated/resources/data/basemetals/recipes/antimony_block_ingot.json index d04bbc05..907f3d31 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_block_ingot.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/antimony" - } - ], - "result": { - "item": "basemetals:antimony_ingot", - "count": 9 - }, - "group": "basemetals:antimony_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/antimony" + } + ], + "result": { + "item": "basemetals:antimony_ingot", + "count": 9 + }, + "group": "basemetals:antimony_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_bolt.json b/src/generated/resources/data/basemetals/recipes/antimony_bolt.json index 286e2b56..5c911163 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_bolt.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "R": { + "tag": "forge:rods/antimony" + } }, - "R": { - "tag": "forge:rods/antimony" - } - }, - "result": { - "item": "basemetals:antimony_bolt", - "count": 4 - }, - "group": "basemetals:antimony_bolt" + "result": { + "item": "basemetals:antimony_bolt", + "count": 4 + }, + "group": "basemetals:antimony_bolt" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_boots.json b/src/generated/resources/data/basemetals/recipes/antimony_boots.json index f3a70562..1fe2c9f4 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_boots.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_boots.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/antimony" - } - }, - "result": { - "item": "basemetals:antimony_boots" - }, - "group": "basemetals:antimony_boots" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/antimony" + } + }, + "result": { + "item": "basemetals:antimony_boots" + }, + "group": "basemetals:antimony_boots" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_bow.json b/src/generated/resources/data/basemetals/recipes/antimony_bow.json index eeb4e44c..dd12385b 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_bow.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_bow.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " RS", - "R S", - " RS" - ], - "key": { - "R": { - "tag": "forge:rods/antimony" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " RS", + "R S", + " RS" + ], + "key": { + "R": { + "tag": "forge:rods/antimony" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:antimony_bow" - }, - "group": "basemetals:antimony_bow" + "result": { + "item": "basemetals:antimony_bow" + }, + "group": "basemetals:antimony_bow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_button.json b/src/generated/resources/data/basemetals/recipes/antimony_button.json index 0ae1d8f3..855a29bb 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_button.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_button.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:nuggets/antimony" - } - }, - "result": { - "item": "basemetals:antimony_button" - }, - "group": "basemetals:antimony_button" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:nuggets/antimony" + } + }, + "result": { + "item": "basemetals:antimony_button" + }, + "group": "basemetals:antimony_button" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_chestplate.json b/src/generated/resources/data/basemetals/recipes/antimony_chestplate.json index d8a6b3c2..d50f649d 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_chestplate.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/antimony" - } - }, - "result": { - "item": "basemetals:antimony_chestplate" - }, - "group": "basemetals:antimony_chestplate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/antimony" + } + }, + "result": { + "item": "basemetals:antimony_chestplate" + }, + "group": "basemetals:antimony_chestplate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_crackhammer.json b/src/generated/resources/data/basemetals/recipes/antimony_crackhammer.json index 98bc7c30..0721297f 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:storage_blocks/antimony" + } }, - "X": { - "tag": "forge:storage_blocks/antimony" - } - }, - "result": { - "item": "basemetals:antimony_crackhammer" - }, - "group": "basemetals:antimony_crackhammer" + "result": { + "item": "basemetals:antimony_crackhammer" + }, + "group": "basemetals:antimony_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_crossbow.json b/src/generated/resources/data/basemetals/recipes/antimony_crossbow.json index 8ea642e0..81be0cc7 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_crossbow.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRR", - " SR", - "R G" - ], - "key": { - "G": { - "tag": "forge:gears/antimony" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRR", + " SR", + "R G" + ], + "key": { + "G": { + "tag": "forge:gears/antimony" + }, + "R": { + "tag": "forge:rods/antimony" + }, + "S": { + "item": "minecraft:string" + } }, - "R": { - "tag": "forge:rods/antimony" + "result": { + "item": "basemetals:antimony_crossbow" }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:antimony_crossbow" - }, - "group": "basemetals:antimony_crossbow" + "group": "basemetals:antimony_crossbow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_door.json b/src/generated/resources/data/basemetals/recipes/antimony_door.json index b1bb6b21..01fbef64 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_door.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_door.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/antimony" - } - }, - "result": { - "item": "basemetals:antimony_door", - "count": 3 - }, - "group": "basemetals:antimony_door" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/antimony" + } + }, + "result": { + "item": "basemetals:antimony_door", + "count": 3 + }, + "group": "basemetals:antimony_door" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_fishingrod.json b/src/generated/resources/data/basemetals/recipes/antimony_fishingrod.json index 8b54bc93..a2e47ad5 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_fishingrod.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " R", - " RS", - "R S" - ], - "key": { - "R": { - "tag": "forge:rods/antimony" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " R", + " RS", + "R S" + ], + "key": { + "R": { + "tag": "forge:rods/antimony" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:antimony_fishing_rod" - }, - "group": "basemetals:antimony_fishing_rod" + "result": { + "item": "basemetals:antimony_fishing_rod" + }, + "group": "basemetals:antimony_fishing_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_gear.json b/src/generated/resources/data/basemetals/recipes/antimony_gear.json index fd3a6db9..4da1c9dc 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_gear.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_gear.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "XRX", - " X " - ], - "key": { - "R": { - "tag": "forge:rods/antimony" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XRX", + " X " + ], + "key": { + "R": { + "tag": "forge:rods/antimony" + }, + "X": { + "tag": "forge:ingots/antimony" + } }, - "X": { - "tag": "forge:ingots/antimony" - } - }, - "result": { - "item": "basemetals:antimony_gear", - "count": 4 - }, - "group": "basemetals:antimony_gear" + "result": { + "item": "basemetals:antimony_gear", + "count": 4 + }, + "group": "basemetals:antimony_gear" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_helmet.json b/src/generated/resources/data/basemetals/recipes/antimony_helmet.json index 45d7868c..9f16f4dc 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_helmet.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/antimony" - } - }, - "result": { - "item": "basemetals:antimony_helmet" - }, - "group": "basemetals:antimony_helmet" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/antimony" + } + }, + "result": { + "item": "basemetals:antimony_helmet" + }, + "group": "basemetals:antimony_helmet" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_hoe.json b/src/generated/resources/data/basemetals/recipes/antimony_hoe.json index 271e19b0..f57273de 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_hoe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - " S", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " S", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/antimony" + } }, - "X": { - "tag": "forge:ingots/antimony" - } - }, - "result": { - "item": "basemetals:antimony_hoe" - }, - "group": "basemetals:antimony_hoe" + "result": { + "item": "basemetals:antimony_hoe" + }, + "group": "basemetals:antimony_hoe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_horsearmor.json b/src/generated/resources/data/basemetals/recipes/antimony_horsearmor.json index 494362bf..d43c80af 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_horsearmor.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "XWX", - "XXX" - ], - "key": { - "W": { - "tag": "minecraft:wool" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "XWX", + "XXX" + ], + "key": { + "W": { + "tag": "minecraft:wool" + }, + "X": { + "tag": "forge:ingots/antimony" + } }, - "X": { - "tag": "forge:ingots/antimony" - } - }, - "result": { - "item": "basemetals:antimony_horse_armor" - }, - "group": "basemetals:antimony_horse_armor" + "result": { + "item": "basemetals:antimony_horse_armor" + }, + "group": "basemetals:antimony_horse_armor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/antimony_ingot_from_nuggets.json index b9241aed..29ab1f8c 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_ingot_from_nuggets.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:nuggets/antimony" - } - }, - "result": { - "item": "basemetals:antimony_ingot" - }, - "group": "basemetals:antimony_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:nuggets/antimony" + } + }, + "result": { + "item": "basemetals:antimony_ingot" + }, + "group": "basemetals:antimony_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_leggings.json b/src/generated/resources/data/basemetals/recipes/antimony_leggings.json index 14194b87..00e05e0e 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_leggings.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/antimony" - } - }, - "result": { - "item": "basemetals:antimony_leggings" - }, - "group": "basemetals:antimony_leggings" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/antimony" + } + }, + "result": { + "item": "basemetals:antimony_leggings" + }, + "group": "basemetals:antimony_leggings" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_lever.json b/src/generated/resources/data/basemetals/recipes/antimony_lever.json index 1cb1671a..8e941eba 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_lever.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_lever.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "X" - ], - "key": { - "R": { - "tag": "forge:rods/antimony" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "X" + ], + "key": { + "R": { + "tag": "forge:rods/antimony" + }, + "X": { + "tag": "forge:ingots/antimony" + } }, - "X": { - "tag": "forge:ingots/antimony" - } - }, - "result": { - "item": "basemetals:antimony_lever" - }, - "group": "basemetals:antimony_lever" + "result": { + "item": "basemetals:antimony_lever" + }, + "group": "basemetals:antimony_lever" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_nuggets.json b/src/generated/resources/data/basemetals/recipes/antimony_nuggets.json index 90533e1c..f222fa0f 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_nuggets.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:ingots/antimony" - } - ], - "result": { - "item": "basemetals:antimony_nugget", - "count": 9 - }, - "group": "basemetals:antimony_nugget" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/antimony" + } + ], + "result": { + "item": "basemetals:antimony_nugget", + "count": 9 + }, + "group": "basemetals:antimony_nugget" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_pickaxe.json b/src/generated/resources/data/basemetals/recipes/antimony_pickaxe.json index 6df2b4d2..022ff1c3 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_pickaxe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " S ", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " S ", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/antimony" + } }, - "X": { - "tag": "forge:ingots/antimony" - } - }, - "result": { - "item": "basemetals:antimony_pickaxe" - }, - "group": "basemetals:antimony_pickaxe" + "result": { + "item": "basemetals:antimony_pickaxe" + }, + "group": "basemetals:antimony_pickaxe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_plate.json b/src/generated/resources/data/basemetals/recipes/antimony_plate.json index 1d619627..fcc95a42 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_plate.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_plate.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/antimony" - } - }, - "result": { - "item": "basemetals:antimony_plate", - "count": 3 - }, - "group": "basemetals:antimony_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/antimony" + } + }, + "result": { + "item": "basemetals:antimony_plate", + "count": 3 + }, + "group": "basemetals:antimony_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/antimony_powder_from_small.json index d1f334d6..d494b80a 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/antimony" - } - }, - "result": { - "item": "basemetals:antimony_powder" - }, - "group": "basemetals:antimony_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/antimony" + } + }, + "result": { + "item": "basemetals:antimony_powder" + }, + "group": "basemetals:antimony_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/antimony_pressure_plate.json index 0cdde7e6..be17795f 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_pressure_plate.json @@ -1,15 +1,18 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/antimony" - } - }, - "result": { - "item": "basemetals:antimony_pressure_plate" - }, - "group": "basemetals:antimony_pressure_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/antimony" + } + }, + "result": { + "item": "basemetals:antimony_pressure_plate" + }, + "group": "basemetals:antimony_pressure_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_rod.json b/src/generated/resources/data/basemetals/recipes/antimony_rod.json index 57d94479..a19c3d55 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_rod.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_rod.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:ingots/antimony" - } - }, - "result": { - "item": "basemetals:antimony_rod", - "count": 4 - }, - "group": "basemetals:antimony_rod" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:ingots/antimony" + } + }, + "result": { + "item": "basemetals:antimony_rod", + "count": 4 + }, + "group": "basemetals:antimony_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_scythe.json b/src/generated/resources/data/basemetals/recipes/antimony_scythe.json index d17e22eb..048902f2 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/antimony" + } }, - "X": { - "tag": "forge:ingots/antimony" - } - }, - "result": { - "item": "basemetals:antimony_scythe" - }, - "group": "basemetals:antimony_scythe" + "result": { + "item": "basemetals:antimony_scythe" + }, + "group": "basemetals:antimony_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_shears.json b/src/generated/resources/data/basemetals/recipes/antimony_shears.json index 1b1c623a..b74a5c1f 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_shears.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_shears.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "X " - ], - "key": { - "X": { - "tag": "forge:ingots/antimony" - } - }, - "result": { - "item": "basemetals:antimony_shears" - }, - "group": "basemetals:antimony_shears" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "X " + ], + "key": { + "X": { + "tag": "forge:ingots/antimony" + } + }, + "result": { + "item": "basemetals:antimony_shears" + }, + "group": "basemetals:antimony_shears" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_shield.json b/src/generated/resources/data/basemetals/recipes/antimony_shield.json index c3ab12b1..55497a47 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_shield.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_shield.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XWX", - "XXX", - " X " - ], - "key": { - "W": { - "tag": "minecraft:planks" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XWX", + "XXX", + " X " + ], + "key": { + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:ingots/antimony" + } }, - "X": { - "tag": "forge:ingots/antimony" - } - }, - "result": { - "item": "basemetals:antimony_shield" - }, - "group": "basemetals:antimony_shield" + "result": { + "item": "basemetals:antimony_shield" + }, + "group": "basemetals:antimony_shield" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_shovel.json b/src/generated/resources/data/basemetals/recipes/antimony_shovel.json index 5ffa2dea..210e4de8 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_shovel.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/antimony" + } }, - "X": { - "tag": "forge:ingots/antimony" - } - }, - "result": { - "item": "basemetals:antimony_shovel" - }, - "group": "basemetals:antimony_shovel" + "result": { + "item": "basemetals:antimony_shovel" + }, + "group": "basemetals:antimony_shovel" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_slab.json b/src/generated/resources/data/basemetals/recipes/antimony_slab.json index 1d6c5fbe..989cc5bc 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_slab.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_slab.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/antimony" - } - }, - "result": { - "item": "basemetals:antimony_slab", - "count": 6 - }, - "group": "basemetals:antimony_slab" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/antimony" + } + }, + "result": { + "item": "basemetals:antimony_slab", + "count": 6 + }, + "group": "basemetals:antimony_slab" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_smallpowder.json b/src/generated/resources/data/basemetals/recipes/antimony_smallpowder.json index d4946289..63867ba9 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/antimony" - } - ], - "result": { - "item": "basemetals:antimony_smallpowder", - "count": 9 - }, - "group": "basemetals:antimony_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/antimony" + } + ], + "result": { + "item": "basemetals:antimony_smallpowder", + "count": 9 + }, + "group": "basemetals:antimony_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_stairs.json b/src/generated/resources/data/basemetals/recipes/antimony_stairs.json index a5db1bbf..8bd4ea7b 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_stairs.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X ", - "XX ", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/antimony" - } - }, - "result": { - "item": "basemetals:antimony_stairs", - "count": 4 - }, - "group": "basemetals:antimony_stairs" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/antimony" + } + }, + "result": { + "item": "basemetals:antimony_stairs", + "count": 4 + }, + "group": "basemetals:antimony_stairs" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_sword.json b/src/generated/resources/data/basemetals/recipes/antimony_sword.json index da0061f9..940a4578 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_sword.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_sword.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/antimony" + } }, - "X": { - "tag": "forge:ingots/antimony" - } - }, - "result": { - "item": "basemetals:antimony_sword" - }, - "group": "basemetals:antimony_sword" + "result": { + "item": "basemetals:antimony_sword" + }, + "group": "basemetals:antimony_sword" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_trapdoor.json b/src/generated/resources/data/basemetals/recipes/antimony_trapdoor.json index f93bf1ff..22ce9d42 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_trapdoor.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/antimony" - } - }, - "result": { - "item": "basemetals:antimony_trapdoor" - }, - "group": "basemetals:antimony_trapdoor" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/antimony" + } + }, + "result": { + "item": "basemetals:antimony_trapdoor" + }, + "group": "basemetals:antimony_trapdoor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/antimony_wall.json b/src/generated/resources/data/basemetals/recipes/antimony_wall.json index 81f39671..8a6739e3 100644 --- a/src/generated/resources/data/basemetals/recipes/antimony_wall.json +++ b/src/generated/resources/data/basemetals/recipes/antimony_wall.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/antimony" - } - }, - "result": { - "item": "basemetals:antimony_wall", - "count": 6 - }, - "group": "basemetals:antimony_wall" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/antimony" + } + }, + "result": { + "item": "basemetals:antimony_wall", + "count": 6 + }, + "group": "basemetals:antimony_wall" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_arrow.json b/src/generated/resources/data/basemetals/recipes/aquarium_arrow.json index e392c831..840ffd07 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_arrow.json @@ -1,24 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "N", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "N", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "N": { + "tag": "forge:nuggets/aquarium" + }, + "R": { + "tag": "forge:rods/aquarium" + } }, - "N": { - "tag": "forge:nuggets/aquarium" + "result": { + "item": "basemetals:aquarium_arrow", + "count": 4 }, - "R": { - "tag": "forge:rods/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_arrow", - "count": 4 - }, - "group": "basemetals:aquarium_arrow" + "group": "basemetals:aquarium_arrow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_axe.json b/src/generated/resources/data/basemetals/recipes/aquarium_axe.json index 0a36e383..80b7f6f9 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_axe.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_axe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XS", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XS", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/aquarium" + } }, - "X": { - "tag": "forge:ingots/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_axe" - }, - "group": "basemetals:aquarium_axe" + "result": { + "item": "basemetals:aquarium_axe" + }, + "group": "basemetals:aquarium_axe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_bars.json b/src/generated/resources/data/basemetals/recipes/aquarium_bars.json index 920210d9..6a1fc152 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_bars.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_bars.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_bars", - "count": 16 - }, - "group": "basemetals:aquarium_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/aquarium" + } + }, + "result": { + "item": "basemetals:aquarium_bars", + "count": 16 + }, + "group": "basemetals:aquarium_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_bars_2.json b/src/generated/resources/data/basemetals/recipes/aquarium_bars_2.json index e5345d5e..7061206c 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_bars_2.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:rods/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_bars", - "count": 4 - }, - "group": "basemetals:aquarium_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:rods/aquarium" + } + }, + "result": { + "item": "basemetals:aquarium_bars", + "count": 4 + }, + "group": "basemetals:aquarium_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_blend.json b/src/generated/resources/data/basemetals/recipes/aquarium_blend.json index 0ecd92e4..c14ed8c0 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_blend.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_blend.json @@ -1,22 +1,25 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/copper" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/copper" + }, + { + "tag": "forge:dusts/copper" + }, + { + "tag": "forge:dusts/zinc" + }, + { + "tag": "forge:dusts/prismarine" + } + ], + "result": { + "item": "basemetals:aquarium_blend", + "count": 3 }, - { - "tag": "forge:dusts/copper" - }, - { - "tag": "forge:dusts/zinc" - }, - { - "tag": "forge:dusts/prismarine" - } - ], - "result": { - "item": "basemetals:aquarium_blend", - "count": 3 - }, - "group": "basemetals:aquarium_blend" + "group": "basemetals:aquarium_blend" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_blend_from_small.json b/src/generated/resources/data/basemetals/recipes/aquarium_blend_from_small.json index a7836f0a..11e6cad3 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_blend_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_blend_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:small_blends/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_blend" - }, - "group": "basemetals:aquarium_blend" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:small_blends/aquarium" + } + }, + "result": { + "item": "basemetals:aquarium_blend" + }, + "group": "basemetals:aquarium_blend" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_block.json b/src/generated/resources/data/basemetals/recipes/aquarium_block.json index 536d3da9..afe19b25 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_block.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_block.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_block" - }, - "group": "basemetals:aquarium_block" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/aquarium" + } + }, + "result": { + "item": "basemetals:aquarium_block" + }, + "group": "basemetals:aquarium_block" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_block_ingot.json b/src/generated/resources/data/basemetals/recipes/aquarium_block_ingot.json index 31cabb84..36ee17cc 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_block_ingot.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/aquarium" - } - ], - "result": { - "item": "basemetals:aquarium_ingot", - "count": 9 - }, - "group": "basemetals:aquarium_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/aquarium" + } + ], + "result": { + "item": "basemetals:aquarium_ingot", + "count": 9 + }, + "group": "basemetals:aquarium_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_bolt.json b/src/generated/resources/data/basemetals/recipes/aquarium_bolt.json index 12a02b47..7cbba90e 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_bolt.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "R": { + "tag": "forge:rods/aquarium" + } }, - "R": { - "tag": "forge:rods/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_bolt", - "count": 4 - }, - "group": "basemetals:aquarium_bolt" + "result": { + "item": "basemetals:aquarium_bolt", + "count": 4 + }, + "group": "basemetals:aquarium_bolt" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_boots.json b/src/generated/resources/data/basemetals/recipes/aquarium_boots.json index ba86168d..945ee1f5 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_boots.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_boots.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_boots" - }, - "group": "basemetals:aquarium_boots" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/aquarium" + } + }, + "result": { + "item": "basemetals:aquarium_boots" + }, + "group": "basemetals:aquarium_boots" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_bow.json b/src/generated/resources/data/basemetals/recipes/aquarium_bow.json index 858c8f36..28ca9d6e 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_bow.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_bow.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " RS", - "R S", - " RS" - ], - "key": { - "R": { - "tag": "forge:rods/aquarium" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " RS", + "R S", + " RS" + ], + "key": { + "R": { + "tag": "forge:rods/aquarium" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:aquarium_bow" - }, - "group": "basemetals:aquarium_bow" + "result": { + "item": "basemetals:aquarium_bow" + }, + "group": "basemetals:aquarium_bow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_button.json b/src/generated/resources/data/basemetals/recipes/aquarium_button.json index 123fd354..cc2b5acc 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_button.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_button.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:nuggets/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_button" - }, - "group": "basemetals:aquarium_button" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:nuggets/aquarium" + } + }, + "result": { + "item": "basemetals:aquarium_button" + }, + "group": "basemetals:aquarium_button" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_chestplate.json b/src/generated/resources/data/basemetals/recipes/aquarium_chestplate.json index d1444d06..134224f3 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_chestplate.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_chestplate" - }, - "group": "basemetals:aquarium_chestplate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/aquarium" + } + }, + "result": { + "item": "basemetals:aquarium_chestplate" + }, + "group": "basemetals:aquarium_chestplate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_crackhammer.json b/src/generated/resources/data/basemetals/recipes/aquarium_crackhammer.json index a3ce7b8a..0033d30b 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:storage_blocks/aquarium" + } }, - "X": { - "tag": "forge:storage_blocks/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_crackhammer" - }, - "group": "basemetals:aquarium_crackhammer" + "result": { + "item": "basemetals:aquarium_crackhammer" + }, + "group": "basemetals:aquarium_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_crossbow.json b/src/generated/resources/data/basemetals/recipes/aquarium_crossbow.json index af6b8bfa..67284a9d 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_crossbow.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRR", - " SR", - "R G" - ], - "key": { - "G": { - "tag": "forge:gears/aquarium" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRR", + " SR", + "R G" + ], + "key": { + "G": { + "tag": "forge:gears/aquarium" + }, + "R": { + "tag": "forge:rods/aquarium" + }, + "S": { + "item": "minecraft:string" + } }, - "R": { - "tag": "forge:rods/aquarium" + "result": { + "item": "basemetals:aquarium_crossbow" }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:aquarium_crossbow" - }, - "group": "basemetals:aquarium_crossbow" + "group": "basemetals:aquarium_crossbow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_door.json b/src/generated/resources/data/basemetals/recipes/aquarium_door.json index 581fa1c3..ce53e4a1 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_door.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_door.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_door", - "count": 3 - }, - "group": "basemetals:aquarium_door" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/aquarium" + } + }, + "result": { + "item": "basemetals:aquarium_door", + "count": 3 + }, + "group": "basemetals:aquarium_door" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_fishingrod.json b/src/generated/resources/data/basemetals/recipes/aquarium_fishingrod.json index 0aba3798..0c296a27 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_fishingrod.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " R", - " RS", - "R S" - ], - "key": { - "R": { - "tag": "forge:rods/aquarium" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " R", + " RS", + "R S" + ], + "key": { + "R": { + "tag": "forge:rods/aquarium" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:aquarium_fishing_rod" - }, - "group": "basemetals:aquarium_fishing_rod" + "result": { + "item": "basemetals:aquarium_fishing_rod" + }, + "group": "basemetals:aquarium_fishing_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_gear.json b/src/generated/resources/data/basemetals/recipes/aquarium_gear.json index 3de73797..22c99158 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_gear.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_gear.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "XRX", - " X " - ], - "key": { - "R": { - "tag": "forge:rods/aquarium" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XRX", + " X " + ], + "key": { + "R": { + "tag": "forge:rods/aquarium" + }, + "X": { + "tag": "forge:ingots/aquarium" + } }, - "X": { - "tag": "forge:ingots/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_gear", - "count": 4 - }, - "group": "basemetals:aquarium_gear" + "result": { + "item": "basemetals:aquarium_gear", + "count": 4 + }, + "group": "basemetals:aquarium_gear" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_helmet.json b/src/generated/resources/data/basemetals/recipes/aquarium_helmet.json index b018e82c..c9589c04 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_helmet.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_helmet" - }, - "group": "basemetals:aquarium_helmet" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/aquarium" + } + }, + "result": { + "item": "basemetals:aquarium_helmet" + }, + "group": "basemetals:aquarium_helmet" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_hoe.json b/src/generated/resources/data/basemetals/recipes/aquarium_hoe.json index 60516a20..3e80d59f 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_hoe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - " S", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " S", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/aquarium" + } }, - "X": { - "tag": "forge:ingots/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_hoe" - }, - "group": "basemetals:aquarium_hoe" + "result": { + "item": "basemetals:aquarium_hoe" + }, + "group": "basemetals:aquarium_hoe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_horsearmor.json b/src/generated/resources/data/basemetals/recipes/aquarium_horsearmor.json index 57f4d010..0e93722d 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_horsearmor.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "XWX", - "XXX" - ], - "key": { - "W": { - "tag": "minecraft:wool" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "XWX", + "XXX" + ], + "key": { + "W": { + "tag": "minecraft:wool" + }, + "X": { + "tag": "forge:ingots/aquarium" + } }, - "X": { - "tag": "forge:ingots/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_horse_armor" - }, - "group": "basemetals:aquarium_horse_armor" + "result": { + "item": "basemetals:aquarium_horse_armor" + }, + "group": "basemetals:aquarium_horse_armor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/aquarium_ingot_from_nuggets.json index 6e4f797a..1765772c 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_ingot_from_nuggets.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:nuggets/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_ingot" - }, - "group": "basemetals:aquarium_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:nuggets/aquarium" + } + }, + "result": { + "item": "basemetals:aquarium_ingot" + }, + "group": "basemetals:aquarium_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_leggings.json b/src/generated/resources/data/basemetals/recipes/aquarium_leggings.json index b0483557..b1701bb5 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_leggings.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_leggings" - }, - "group": "basemetals:aquarium_leggings" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/aquarium" + } + }, + "result": { + "item": "basemetals:aquarium_leggings" + }, + "group": "basemetals:aquarium_leggings" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_lever.json b/src/generated/resources/data/basemetals/recipes/aquarium_lever.json index 2d9b2632..a51dbed4 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_lever.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_lever.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "X" - ], - "key": { - "R": { - "tag": "forge:rods/aquarium" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "X" + ], + "key": { + "R": { + "tag": "forge:rods/aquarium" + }, + "X": { + "tag": "forge:ingots/aquarium" + } }, - "X": { - "tag": "forge:ingots/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_lever" - }, - "group": "basemetals:aquarium_lever" + "result": { + "item": "basemetals:aquarium_lever" + }, + "group": "basemetals:aquarium_lever" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_nuggets.json b/src/generated/resources/data/basemetals/recipes/aquarium_nuggets.json index 40be63ee..8f833c86 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_nuggets.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:ingots/aquarium" - } - ], - "result": { - "item": "basemetals:aquarium_nugget", - "count": 9 - }, - "group": "basemetals:aquarium_nugget" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/aquarium" + } + ], + "result": { + "item": "basemetals:aquarium_nugget", + "count": 9 + }, + "group": "basemetals:aquarium_nugget" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_pickaxe.json b/src/generated/resources/data/basemetals/recipes/aquarium_pickaxe.json index fa489487..f5baf927 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_pickaxe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " S ", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " S ", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/aquarium" + } }, - "X": { - "tag": "forge:ingots/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_pickaxe" - }, - "group": "basemetals:aquarium_pickaxe" + "result": { + "item": "basemetals:aquarium_pickaxe" + }, + "group": "basemetals:aquarium_pickaxe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_plate.json b/src/generated/resources/data/basemetals/recipes/aquarium_plate.json index 12a896d2..46ccb271 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_plate.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_plate.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_plate", - "count": 3 - }, - "group": "basemetals:aquarium_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/aquarium" + } + }, + "result": { + "item": "basemetals:aquarium_plate", + "count": 3 + }, + "group": "basemetals:aquarium_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/aquarium_powder_from_small.json index 8fd42b54..cd9d952f 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_powder" - }, - "group": "basemetals:aquarium_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/aquarium" + } + }, + "result": { + "item": "basemetals:aquarium_powder" + }, + "group": "basemetals:aquarium_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/aquarium_pressure_plate.json index 8497c917..b9aa36d6 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_pressure_plate.json @@ -1,15 +1,18 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_pressure_plate" - }, - "group": "basemetals:aquarium_pressure_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/aquarium" + } + }, + "result": { + "item": "basemetals:aquarium_pressure_plate" + }, + "group": "basemetals:aquarium_pressure_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_rod.json b/src/generated/resources/data/basemetals/recipes/aquarium_rod.json index 5a59644b..9cc1e98f 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_rod.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_rod.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:ingots/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_rod", - "count": 4 - }, - "group": "basemetals:aquarium_rod" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:ingots/aquarium" + } + }, + "result": { + "item": "basemetals:aquarium_rod", + "count": 4 + }, + "group": "basemetals:aquarium_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_scythe.json b/src/generated/resources/data/basemetals/recipes/aquarium_scythe.json index 58bb0eee..d39355df 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/aquarium" + } }, - "X": { - "tag": "forge:ingots/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_scythe" - }, - "group": "basemetals:aquarium_scythe" + "result": { + "item": "basemetals:aquarium_scythe" + }, + "group": "basemetals:aquarium_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_shears.json b/src/generated/resources/data/basemetals/recipes/aquarium_shears.json index e77a64ab..46110d44 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_shears.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_shears.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "X " - ], - "key": { - "X": { - "tag": "forge:ingots/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_shears" - }, - "group": "basemetals:aquarium_shears" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "X " + ], + "key": { + "X": { + "tag": "forge:ingots/aquarium" + } + }, + "result": { + "item": "basemetals:aquarium_shears" + }, + "group": "basemetals:aquarium_shears" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_shield.json b/src/generated/resources/data/basemetals/recipes/aquarium_shield.json index 9f18821a..1e356bd1 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_shield.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_shield.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XWX", - "XXX", - " X " - ], - "key": { - "W": { - "tag": "minecraft:planks" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XWX", + "XXX", + " X " + ], + "key": { + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:ingots/aquarium" + } }, - "X": { - "tag": "forge:ingots/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_shield" - }, - "group": "basemetals:aquarium_shield" + "result": { + "item": "basemetals:aquarium_shield" + }, + "group": "basemetals:aquarium_shield" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_shovel.json b/src/generated/resources/data/basemetals/recipes/aquarium_shovel.json index 627ebe3e..5cac076c 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_shovel.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/aquarium" + } }, - "X": { - "tag": "forge:ingots/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_shovel" - }, - "group": "basemetals:aquarium_shovel" + "result": { + "item": "basemetals:aquarium_shovel" + }, + "group": "basemetals:aquarium_shovel" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_slab.json b/src/generated/resources/data/basemetals/recipes/aquarium_slab.json index 8864510f..92db5ae7 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_slab.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_slab.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_slab", - "count": 6 - }, - "group": "basemetals:aquarium_slab" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/aquarium" + } + }, + "result": { + "item": "basemetals:aquarium_slab", + "count": 6 + }, + "group": "basemetals:aquarium_slab" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_smallblend.json b/src/generated/resources/data/basemetals/recipes/aquarium_smallblend.json index 890cbc17..63aa86a1 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_smallblend.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_smallblend.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:blends/aquarium" - } - ], - "result": { - "item": "basemetals:aquarium_smallblend", - "count": 9 - }, - "group": "basemetals:aquarium_smallblend" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:blends/aquarium" + } + ], + "result": { + "item": "basemetals:aquarium_smallblend", + "count": 9 + }, + "group": "basemetals:aquarium_smallblend" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_smallpowder.json b/src/generated/resources/data/basemetals/recipes/aquarium_smallpowder.json index ad71443b..f767acdf 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/aquarium" - } - ], - "result": { - "item": "basemetals:aquarium_smallpowder", - "count": 9 - }, - "group": "basemetals:aquarium_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/aquarium" + } + ], + "result": { + "item": "basemetals:aquarium_smallpowder", + "count": 9 + }, + "group": "basemetals:aquarium_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_stairs.json b/src/generated/resources/data/basemetals/recipes/aquarium_stairs.json index 9a4e7d1d..8da2d78b 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_stairs.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X ", - "XX ", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_stairs", - "count": 4 - }, - "group": "basemetals:aquarium_stairs" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/aquarium" + } + }, + "result": { + "item": "basemetals:aquarium_stairs", + "count": 4 + }, + "group": "basemetals:aquarium_stairs" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_sword.json b/src/generated/resources/data/basemetals/recipes/aquarium_sword.json index 9874fe66..8a9c824f 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_sword.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_sword.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/aquarium" + } }, - "X": { - "tag": "forge:ingots/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_sword" - }, - "group": "basemetals:aquarium_sword" + "result": { + "item": "basemetals:aquarium_sword" + }, + "group": "basemetals:aquarium_sword" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_trapdoor.json b/src/generated/resources/data/basemetals/recipes/aquarium_trapdoor.json index e5ed1637..16f360b1 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_trapdoor.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_trapdoor" - }, - "group": "basemetals:aquarium_trapdoor" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/aquarium" + } + }, + "result": { + "item": "basemetals:aquarium_trapdoor" + }, + "group": "basemetals:aquarium_trapdoor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/aquarium_wall.json b/src/generated/resources/data/basemetals/recipes/aquarium_wall.json index 5ec59cc0..056588f7 100644 --- a/src/generated/resources/data/basemetals/recipes/aquarium_wall.json +++ b/src/generated/resources/data/basemetals/recipes/aquarium_wall.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/aquarium" - } - }, - "result": { - "item": "basemetals:aquarium_wall", - "count": 6 - }, - "group": "basemetals:aquarium_wall" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/aquarium" + } + }, + "result": { + "item": "basemetals:aquarium_wall", + "count": 6 + }, + "group": "basemetals:aquarium_wall" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_arrow.json b/src/generated/resources/data/basemetals/recipes/bismuth_arrow.json index a49716e9..1d432436 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_arrow.json @@ -1,24 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "N", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "N", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "N": { + "tag": "forge:nuggets/bismuth" + }, + "R": { + "tag": "forge:rods/bismuth" + } }, - "N": { - "tag": "forge:nuggets/bismuth" + "result": { + "item": "basemetals:bismuth_arrow", + "count": 4 }, - "R": { - "tag": "forge:rods/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_arrow", - "count": 4 - }, - "group": "basemetals:bismuth_arrow" + "group": "basemetals:bismuth_arrow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_axe.json b/src/generated/resources/data/basemetals/recipes/bismuth_axe.json index 7f68f321..9b445040 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_axe.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_axe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XS", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XS", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/bismuth" + } }, - "X": { - "tag": "forge:ingots/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_axe" - }, - "group": "basemetals:bismuth_axe" + "result": { + "item": "basemetals:bismuth_axe" + }, + "group": "basemetals:bismuth_axe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_bars.json b/src/generated/resources/data/basemetals/recipes/bismuth_bars.json index b2e07952..8df8863c 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_bars.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_bars.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_bars", - "count": 16 - }, - "group": "basemetals:bismuth_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/bismuth" + } + }, + "result": { + "item": "basemetals:bismuth_bars", + "count": 16 + }, + "group": "basemetals:bismuth_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_bars_2.json b/src/generated/resources/data/basemetals/recipes/bismuth_bars_2.json index 8849680d..712e9719 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_bars_2.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:rods/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_bars", - "count": 4 - }, - "group": "basemetals:bismuth_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:rods/bismuth" + } + }, + "result": { + "item": "basemetals:bismuth_bars", + "count": 4 + }, + "group": "basemetals:bismuth_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_block.json b/src/generated/resources/data/basemetals/recipes/bismuth_block.json index da3d4e92..fca69e3e 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_block.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_block.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_block" - }, - "group": "basemetals:bismuth_block" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/bismuth" + } + }, + "result": { + "item": "basemetals:bismuth_block" + }, + "group": "basemetals:bismuth_block" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_block_ingot.json b/src/generated/resources/data/basemetals/recipes/bismuth_block_ingot.json index f6c27b3b..e269301d 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_block_ingot.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/bismuth" - } - ], - "result": { - "item": "basemetals:bismuth_ingot", - "count": 9 - }, - "group": "basemetals:bismuth_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/bismuth" + } + ], + "result": { + "item": "basemetals:bismuth_ingot", + "count": 9 + }, + "group": "basemetals:bismuth_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_bolt.json b/src/generated/resources/data/basemetals/recipes/bismuth_bolt.json index 83f82d70..e2f7695b 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_bolt.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "R": { + "tag": "forge:rods/bismuth" + } }, - "R": { - "tag": "forge:rods/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_bolt", - "count": 4 - }, - "group": "basemetals:bismuth_bolt" + "result": { + "item": "basemetals:bismuth_bolt", + "count": 4 + }, + "group": "basemetals:bismuth_bolt" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_boots.json b/src/generated/resources/data/basemetals/recipes/bismuth_boots.json index e998c1d7..f4714903 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_boots.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_boots.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_boots" - }, - "group": "basemetals:bismuth_boots" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/bismuth" + } + }, + "result": { + "item": "basemetals:bismuth_boots" + }, + "group": "basemetals:bismuth_boots" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_bow.json b/src/generated/resources/data/basemetals/recipes/bismuth_bow.json index 33227095..8f764770 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_bow.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_bow.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " RS", - "R S", - " RS" - ], - "key": { - "R": { - "tag": "forge:rods/bismuth" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " RS", + "R S", + " RS" + ], + "key": { + "R": { + "tag": "forge:rods/bismuth" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:bismuth_bow" - }, - "group": "basemetals:bismuth_bow" + "result": { + "item": "basemetals:bismuth_bow" + }, + "group": "basemetals:bismuth_bow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_button.json b/src/generated/resources/data/basemetals/recipes/bismuth_button.json index 39b3820f..e90d2ea5 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_button.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_button.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:nuggets/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_button" - }, - "group": "basemetals:bismuth_button" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:nuggets/bismuth" + } + }, + "result": { + "item": "basemetals:bismuth_button" + }, + "group": "basemetals:bismuth_button" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_chestplate.json b/src/generated/resources/data/basemetals/recipes/bismuth_chestplate.json index 7ebef742..b27a8b23 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_chestplate.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_chestplate" - }, - "group": "basemetals:bismuth_chestplate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/bismuth" + } + }, + "result": { + "item": "basemetals:bismuth_chestplate" + }, + "group": "basemetals:bismuth_chestplate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_crackhammer.json b/src/generated/resources/data/basemetals/recipes/bismuth_crackhammer.json index 0a0244f8..81c0d2ba 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:storage_blocks/bismuth" + } }, - "X": { - "tag": "forge:storage_blocks/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_crackhammer" - }, - "group": "basemetals:bismuth_crackhammer" + "result": { + "item": "basemetals:bismuth_crackhammer" + }, + "group": "basemetals:bismuth_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_crossbow.json b/src/generated/resources/data/basemetals/recipes/bismuth_crossbow.json index 457c8c58..491c4289 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_crossbow.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRR", - " SR", - "R G" - ], - "key": { - "G": { - "tag": "forge:gears/bismuth" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRR", + " SR", + "R G" + ], + "key": { + "G": { + "tag": "forge:gears/bismuth" + }, + "R": { + "tag": "forge:rods/bismuth" + }, + "S": { + "item": "minecraft:string" + } }, - "R": { - "tag": "forge:rods/bismuth" + "result": { + "item": "basemetals:bismuth_crossbow" }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:bismuth_crossbow" - }, - "group": "basemetals:bismuth_crossbow" + "group": "basemetals:bismuth_crossbow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_door.json b/src/generated/resources/data/basemetals/recipes/bismuth_door.json index ef27e774..34e50a15 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_door.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_door.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_door", - "count": 3 - }, - "group": "basemetals:bismuth_door" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/bismuth" + } + }, + "result": { + "item": "basemetals:bismuth_door", + "count": 3 + }, + "group": "basemetals:bismuth_door" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_fishingrod.json b/src/generated/resources/data/basemetals/recipes/bismuth_fishingrod.json index 8395ff9c..e7e1a258 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_fishingrod.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " R", - " RS", - "R S" - ], - "key": { - "R": { - "tag": "forge:rods/bismuth" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " R", + " RS", + "R S" + ], + "key": { + "R": { + "tag": "forge:rods/bismuth" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:bismuth_fishing_rod" - }, - "group": "basemetals:bismuth_fishing_rod" + "result": { + "item": "basemetals:bismuth_fishing_rod" + }, + "group": "basemetals:bismuth_fishing_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_gear.json b/src/generated/resources/data/basemetals/recipes/bismuth_gear.json index 539afb0f..0b75fc1f 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_gear.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_gear.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "XRX", - " X " - ], - "key": { - "R": { - "tag": "forge:rods/bismuth" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XRX", + " X " + ], + "key": { + "R": { + "tag": "forge:rods/bismuth" + }, + "X": { + "tag": "forge:ingots/bismuth" + } }, - "X": { - "tag": "forge:ingots/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_gear", - "count": 4 - }, - "group": "basemetals:bismuth_gear" + "result": { + "item": "basemetals:bismuth_gear", + "count": 4 + }, + "group": "basemetals:bismuth_gear" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_helmet.json b/src/generated/resources/data/basemetals/recipes/bismuth_helmet.json index f9f8dba6..1e4c8caf 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_helmet.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_helmet" - }, - "group": "basemetals:bismuth_helmet" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/bismuth" + } + }, + "result": { + "item": "basemetals:bismuth_helmet" + }, + "group": "basemetals:bismuth_helmet" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_hoe.json b/src/generated/resources/data/basemetals/recipes/bismuth_hoe.json index 5f5ff679..169b4e8d 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_hoe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - " S", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " S", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/bismuth" + } }, - "X": { - "tag": "forge:ingots/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_hoe" - }, - "group": "basemetals:bismuth_hoe" + "result": { + "item": "basemetals:bismuth_hoe" + }, + "group": "basemetals:bismuth_hoe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_horsearmor.json b/src/generated/resources/data/basemetals/recipes/bismuth_horsearmor.json index 503a77ac..c068538b 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_horsearmor.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "XWX", - "XXX" - ], - "key": { - "W": { - "tag": "minecraft:wool" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "XWX", + "XXX" + ], + "key": { + "W": { + "tag": "minecraft:wool" + }, + "X": { + "tag": "forge:ingots/bismuth" + } }, - "X": { - "tag": "forge:ingots/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_horse_armor" - }, - "group": "basemetals:bismuth_horse_armor" + "result": { + "item": "basemetals:bismuth_horse_armor" + }, + "group": "basemetals:bismuth_horse_armor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/bismuth_ingot_from_nuggets.json index 187b6482..7270fe68 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_ingot_from_nuggets.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:nuggets/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_ingot" - }, - "group": "basemetals:bismuth_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:nuggets/bismuth" + } + }, + "result": { + "item": "basemetals:bismuth_ingot" + }, + "group": "basemetals:bismuth_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_leggings.json b/src/generated/resources/data/basemetals/recipes/bismuth_leggings.json index b275800a..a7473f3e 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_leggings.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_leggings" - }, - "group": "basemetals:bismuth_leggings" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/bismuth" + } + }, + "result": { + "item": "basemetals:bismuth_leggings" + }, + "group": "basemetals:bismuth_leggings" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_lever.json b/src/generated/resources/data/basemetals/recipes/bismuth_lever.json index 58e983de..f19c6098 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_lever.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_lever.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "X" - ], - "key": { - "R": { - "tag": "forge:rods/bismuth" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "X" + ], + "key": { + "R": { + "tag": "forge:rods/bismuth" + }, + "X": { + "tag": "forge:ingots/bismuth" + } }, - "X": { - "tag": "forge:ingots/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_lever" - }, - "group": "basemetals:bismuth_lever" + "result": { + "item": "basemetals:bismuth_lever" + }, + "group": "basemetals:bismuth_lever" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_nuggets.json b/src/generated/resources/data/basemetals/recipes/bismuth_nuggets.json index 2d065843..03188f28 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_nuggets.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:ingots/bismuth" - } - ], - "result": { - "item": "basemetals:bismuth_nugget", - "count": 9 - }, - "group": "basemetals:bismuth_nugget" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/bismuth" + } + ], + "result": { + "item": "basemetals:bismuth_nugget", + "count": 9 + }, + "group": "basemetals:bismuth_nugget" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_pickaxe.json b/src/generated/resources/data/basemetals/recipes/bismuth_pickaxe.json index 1bee57b9..1a78fbf0 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_pickaxe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " S ", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " S ", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/bismuth" + } }, - "X": { - "tag": "forge:ingots/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_pickaxe" - }, - "group": "basemetals:bismuth_pickaxe" + "result": { + "item": "basemetals:bismuth_pickaxe" + }, + "group": "basemetals:bismuth_pickaxe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_plate.json b/src/generated/resources/data/basemetals/recipes/bismuth_plate.json index 49b4edb3..569a8c5a 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_plate.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_plate.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_plate", - "count": 3 - }, - "group": "basemetals:bismuth_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/bismuth" + } + }, + "result": { + "item": "basemetals:bismuth_plate", + "count": 3 + }, + "group": "basemetals:bismuth_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/bismuth_powder_from_small.json index 5e97d6cf..fbc9c862 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_powder" - }, - "group": "basemetals:bismuth_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/bismuth" + } + }, + "result": { + "item": "basemetals:bismuth_powder" + }, + "group": "basemetals:bismuth_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/bismuth_pressure_plate.json index 74a2cff0..a761a35e 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_pressure_plate.json @@ -1,15 +1,18 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_pressure_plate" - }, - "group": "basemetals:bismuth_pressure_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/bismuth" + } + }, + "result": { + "item": "basemetals:bismuth_pressure_plate" + }, + "group": "basemetals:bismuth_pressure_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_rod.json b/src/generated/resources/data/basemetals/recipes/bismuth_rod.json index 66b87638..b0e4303f 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_rod.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_rod.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:ingots/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_rod", - "count": 4 - }, - "group": "basemetals:bismuth_rod" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:ingots/bismuth" + } + }, + "result": { + "item": "basemetals:bismuth_rod", + "count": 4 + }, + "group": "basemetals:bismuth_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_scythe.json b/src/generated/resources/data/basemetals/recipes/bismuth_scythe.json index d5e6358a..c51fcf8d 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/bismuth" + } }, - "X": { - "tag": "forge:ingots/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_scythe" - }, - "group": "basemetals:bismuth_scythe" + "result": { + "item": "basemetals:bismuth_scythe" + }, + "group": "basemetals:bismuth_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_shears.json b/src/generated/resources/data/basemetals/recipes/bismuth_shears.json index fe00c0aa..e05e01f7 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_shears.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_shears.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "X " - ], - "key": { - "X": { - "tag": "forge:ingots/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_shears" - }, - "group": "basemetals:bismuth_shears" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "X " + ], + "key": { + "X": { + "tag": "forge:ingots/bismuth" + } + }, + "result": { + "item": "basemetals:bismuth_shears" + }, + "group": "basemetals:bismuth_shears" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_shield.json b/src/generated/resources/data/basemetals/recipes/bismuth_shield.json index b5936601..47bcda49 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_shield.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_shield.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XWX", - "XXX", - " X " - ], - "key": { - "W": { - "tag": "minecraft:planks" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XWX", + "XXX", + " X " + ], + "key": { + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:ingots/bismuth" + } }, - "X": { - "tag": "forge:ingots/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_shield" - }, - "group": "basemetals:bismuth_shield" + "result": { + "item": "basemetals:bismuth_shield" + }, + "group": "basemetals:bismuth_shield" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_shovel.json b/src/generated/resources/data/basemetals/recipes/bismuth_shovel.json index 64f6fd95..2b3bbcf8 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_shovel.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/bismuth" + } }, - "X": { - "tag": "forge:ingots/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_shovel" - }, - "group": "basemetals:bismuth_shovel" + "result": { + "item": "basemetals:bismuth_shovel" + }, + "group": "basemetals:bismuth_shovel" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_slab.json b/src/generated/resources/data/basemetals/recipes/bismuth_slab.json index 39c39c89..72ed72b5 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_slab.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_slab.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_slab", - "count": 6 - }, - "group": "basemetals:bismuth_slab" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/bismuth" + } + }, + "result": { + "item": "basemetals:bismuth_slab", + "count": 6 + }, + "group": "basemetals:bismuth_slab" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_smallpowder.json b/src/generated/resources/data/basemetals/recipes/bismuth_smallpowder.json index bd7644a5..6bd60c62 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/bismuth" - } - ], - "result": { - "item": "basemetals:bismuth_smallpowder", - "count": 9 - }, - "group": "basemetals:bismuth_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/bismuth" + } + ], + "result": { + "item": "basemetals:bismuth_smallpowder", + "count": 9 + }, + "group": "basemetals:bismuth_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_stairs.json b/src/generated/resources/data/basemetals/recipes/bismuth_stairs.json index b51a639f..b95a2712 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_stairs.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X ", - "XX ", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_stairs", - "count": 4 - }, - "group": "basemetals:bismuth_stairs" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/bismuth" + } + }, + "result": { + "item": "basemetals:bismuth_stairs", + "count": 4 + }, + "group": "basemetals:bismuth_stairs" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_sword.json b/src/generated/resources/data/basemetals/recipes/bismuth_sword.json index d6f94c68..af21bf53 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_sword.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_sword.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/bismuth" + } }, - "X": { - "tag": "forge:ingots/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_sword" - }, - "group": "basemetals:bismuth_sword" + "result": { + "item": "basemetals:bismuth_sword" + }, + "group": "basemetals:bismuth_sword" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_trapdoor.json b/src/generated/resources/data/basemetals/recipes/bismuth_trapdoor.json index a459e52e..af0592ad 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_trapdoor.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_trapdoor" - }, - "group": "basemetals:bismuth_trapdoor" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/bismuth" + } + }, + "result": { + "item": "basemetals:bismuth_trapdoor" + }, + "group": "basemetals:bismuth_trapdoor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bismuth_wall.json b/src/generated/resources/data/basemetals/recipes/bismuth_wall.json index 1eb34469..2e805c3f 100644 --- a/src/generated/resources/data/basemetals/recipes/bismuth_wall.json +++ b/src/generated/resources/data/basemetals/recipes/bismuth_wall.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/bismuth" - } - }, - "result": { - "item": "basemetals:bismuth_wall", - "count": 6 - }, - "group": "basemetals:bismuth_wall" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/bismuth" + } + }, + "result": { + "item": "basemetals:bismuth_wall", + "count": 6 + }, + "group": "basemetals:bismuth_wall" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_arrow.json b/src/generated/resources/data/basemetals/recipes/brass_arrow.json index ea051e17..6a545894 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/brass_arrow.json @@ -1,24 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "N", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "N", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "N": { + "tag": "forge:nuggets/brass" + }, + "R": { + "tag": "forge:rods/brass" + } }, - "N": { - "tag": "forge:nuggets/brass" + "result": { + "item": "basemetals:brass_arrow", + "count": 4 }, - "R": { - "tag": "forge:rods/brass" - } - }, - "result": { - "item": "basemetals:brass_arrow", - "count": 4 - }, - "group": "basemetals:brass_arrow" + "group": "basemetals:brass_arrow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_axe.json b/src/generated/resources/data/basemetals/recipes/brass_axe.json index 75c8f7f4..d5c91383 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_axe.json +++ b/src/generated/resources/data/basemetals/recipes/brass_axe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XS", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XS", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/brass" + } }, - "X": { - "tag": "forge:ingots/brass" - } - }, - "result": { - "item": "basemetals:brass_axe" - }, - "group": "basemetals:brass_axe" + "result": { + "item": "basemetals:brass_axe" + }, + "group": "basemetals:brass_axe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_bars.json b/src/generated/resources/data/basemetals/recipes/brass_bars.json index 4c5e99ea..fda3454e 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_bars.json +++ b/src/generated/resources/data/basemetals/recipes/brass_bars.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/brass" - } - }, - "result": { - "item": "basemetals:brass_bars", - "count": 16 - }, - "group": "basemetals:brass_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/brass" + } + }, + "result": { + "item": "basemetals:brass_bars", + "count": 16 + }, + "group": "basemetals:brass_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_bars_2.json b/src/generated/resources/data/basemetals/recipes/brass_bars_2.json index 80d64bcd..cf0fcc9b 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/brass_bars_2.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:rods/brass" - } - }, - "result": { - "item": "basemetals:brass_bars", - "count": 4 - }, - "group": "basemetals:brass_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:rods/brass" + } + }, + "result": { + "item": "basemetals:brass_bars", + "count": 4 + }, + "group": "basemetals:brass_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_blend.json b/src/generated/resources/data/basemetals/recipes/brass_blend.json index 6f7c1cd0..d3b8507c 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_blend.json +++ b/src/generated/resources/data/basemetals/recipes/brass_blend.json @@ -1,22 +1,25 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/copper" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/copper" + }, + { + "tag": "forge:dusts/copper" + }, + { + "tag": "forge:dusts/copper" + }, + { + "tag": "forge:dusts/zinc" + } + ], + "result": { + "item": "basemetals:brass_blend", + "count": 4 }, - { - "tag": "forge:dusts/copper" - }, - { - "tag": "forge:dusts/copper" - }, - { - "tag": "forge:dusts/zinc" - } - ], - "result": { - "item": "basemetals:brass_blend", - "count": 4 - }, - "group": "basemetals:brass_blend" + "group": "basemetals:brass_blend" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_blend_from_small.json b/src/generated/resources/data/basemetals/recipes/brass_blend_from_small.json index 4a79ed90..8abb86c5 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_blend_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/brass_blend_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:small_blends/brass" - } - }, - "result": { - "item": "basemetals:brass_blend" - }, - "group": "basemetals:brass_blend" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:small_blends/brass" + } + }, + "result": { + "item": "basemetals:brass_blend" + }, + "group": "basemetals:brass_blend" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_block.json b/src/generated/resources/data/basemetals/recipes/brass_block.json index faac5350..f5730fd4 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_block.json +++ b/src/generated/resources/data/basemetals/recipes/brass_block.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/brass" - } - }, - "result": { - "item": "basemetals:brass_block" - }, - "group": "basemetals:brass_block" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/brass" + } + }, + "result": { + "item": "basemetals:brass_block" + }, + "group": "basemetals:brass_block" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_block_ingot.json b/src/generated/resources/data/basemetals/recipes/brass_block_ingot.json index e5013f2e..7671d9c5 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/brass_block_ingot.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/brass" - } - ], - "result": { - "item": "basemetals:brass_ingot", - "count": 9 - }, - "group": "basemetals:brass_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/brass" + } + ], + "result": { + "item": "basemetals:brass_ingot", + "count": 9 + }, + "group": "basemetals:brass_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_bolt.json b/src/generated/resources/data/basemetals/recipes/brass_bolt.json index 54d63a0e..602aaf95 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/brass_bolt.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "R": { + "tag": "forge:rods/brass" + } }, - "R": { - "tag": "forge:rods/brass" - } - }, - "result": { - "item": "basemetals:brass_bolt", - "count": 4 - }, - "group": "basemetals:brass_bolt" + "result": { + "item": "basemetals:brass_bolt", + "count": 4 + }, + "group": "basemetals:brass_bolt" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_boots.json b/src/generated/resources/data/basemetals/recipes/brass_boots.json index ecfacdbc..908903ed 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_boots.json +++ b/src/generated/resources/data/basemetals/recipes/brass_boots.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/brass" - } - }, - "result": { - "item": "basemetals:brass_boots" - }, - "group": "basemetals:brass_boots" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/brass" + } + }, + "result": { + "item": "basemetals:brass_boots" + }, + "group": "basemetals:brass_boots" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_bow.json b/src/generated/resources/data/basemetals/recipes/brass_bow.json index e10674bc..5a8595cf 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_bow.json +++ b/src/generated/resources/data/basemetals/recipes/brass_bow.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " RS", - "R S", - " RS" - ], - "key": { - "R": { - "tag": "forge:rods/brass" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " RS", + "R S", + " RS" + ], + "key": { + "R": { + "tag": "forge:rods/brass" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:brass_bow" - }, - "group": "basemetals:brass_bow" + "result": { + "item": "basemetals:brass_bow" + }, + "group": "basemetals:brass_bow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_button.json b/src/generated/resources/data/basemetals/recipes/brass_button.json index 8ba0ba7d..3214fe96 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_button.json +++ b/src/generated/resources/data/basemetals/recipes/brass_button.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:nuggets/brass" - } - }, - "result": { - "item": "basemetals:brass_button" - }, - "group": "basemetals:brass_button" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:nuggets/brass" + } + }, + "result": { + "item": "basemetals:brass_button" + }, + "group": "basemetals:brass_button" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_chestplate.json b/src/generated/resources/data/basemetals/recipes/brass_chestplate.json index e7c76884..500d87c5 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/brass_chestplate.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/brass" - } - }, - "result": { - "item": "basemetals:brass_chestplate" - }, - "group": "basemetals:brass_chestplate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/brass" + } + }, + "result": { + "item": "basemetals:brass_chestplate" + }, + "group": "basemetals:brass_chestplate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_crackhammer.json b/src/generated/resources/data/basemetals/recipes/brass_crackhammer.json index e40bd067..979759a0 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/brass_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:storage_blocks/brass" + } }, - "X": { - "tag": "forge:storage_blocks/brass" - } - }, - "result": { - "item": "basemetals:brass_crackhammer" - }, - "group": "basemetals:brass_crackhammer" + "result": { + "item": "basemetals:brass_crackhammer" + }, + "group": "basemetals:brass_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_crossbow.json b/src/generated/resources/data/basemetals/recipes/brass_crossbow.json index 13c3e6ad..8ffbf521 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/brass_crossbow.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRR", - " SR", - "R G" - ], - "key": { - "G": { - "tag": "forge:gears/brass" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRR", + " SR", + "R G" + ], + "key": { + "G": { + "tag": "forge:gears/brass" + }, + "R": { + "tag": "forge:rods/brass" + }, + "S": { + "item": "minecraft:string" + } }, - "R": { - "tag": "forge:rods/brass" + "result": { + "item": "basemetals:brass_crossbow" }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:brass_crossbow" - }, - "group": "basemetals:brass_crossbow" + "group": "basemetals:brass_crossbow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_door.json b/src/generated/resources/data/basemetals/recipes/brass_door.json index 47b0d32f..24f3ee9c 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_door.json +++ b/src/generated/resources/data/basemetals/recipes/brass_door.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/brass" - } - }, - "result": { - "item": "basemetals:brass_door", - "count": 3 - }, - "group": "basemetals:brass_door" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/brass" + } + }, + "result": { + "item": "basemetals:brass_door", + "count": 3 + }, + "group": "basemetals:brass_door" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_fishingrod.json b/src/generated/resources/data/basemetals/recipes/brass_fishingrod.json index 409c7415..24ae512f 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/brass_fishingrod.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " R", - " RS", - "R S" - ], - "key": { - "R": { - "tag": "forge:rods/brass" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " R", + " RS", + "R S" + ], + "key": { + "R": { + "tag": "forge:rods/brass" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:brass_fishing_rod" - }, - "group": "basemetals:brass_fishing_rod" + "result": { + "item": "basemetals:brass_fishing_rod" + }, + "group": "basemetals:brass_fishing_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_gear.json b/src/generated/resources/data/basemetals/recipes/brass_gear.json index f8e1abaf..db8d9127 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_gear.json +++ b/src/generated/resources/data/basemetals/recipes/brass_gear.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "XRX", - " X " - ], - "key": { - "R": { - "tag": "forge:rods/brass" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XRX", + " X " + ], + "key": { + "R": { + "tag": "forge:rods/brass" + }, + "X": { + "tag": "forge:ingots/brass" + } }, - "X": { - "tag": "forge:ingots/brass" - } - }, - "result": { - "item": "basemetals:brass_gear", - "count": 4 - }, - "group": "basemetals:brass_gear" + "result": { + "item": "basemetals:brass_gear", + "count": 4 + }, + "group": "basemetals:brass_gear" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_helmet.json b/src/generated/resources/data/basemetals/recipes/brass_helmet.json index fd76e096..8b8e7c22 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/brass_helmet.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/brass" - } - }, - "result": { - "item": "basemetals:brass_helmet" - }, - "group": "basemetals:brass_helmet" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/brass" + } + }, + "result": { + "item": "basemetals:brass_helmet" + }, + "group": "basemetals:brass_helmet" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_hoe.json b/src/generated/resources/data/basemetals/recipes/brass_hoe.json index 5bc3bd74..eb7d1f2d 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/brass_hoe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - " S", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " S", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/brass" + } }, - "X": { - "tag": "forge:ingots/brass" - } - }, - "result": { - "item": "basemetals:brass_hoe" - }, - "group": "basemetals:brass_hoe" + "result": { + "item": "basemetals:brass_hoe" + }, + "group": "basemetals:brass_hoe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_horsearmor.json b/src/generated/resources/data/basemetals/recipes/brass_horsearmor.json index 7f300ee5..a220adab 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/brass_horsearmor.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "XWX", - "XXX" - ], - "key": { - "W": { - "tag": "minecraft:wool" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "XWX", + "XXX" + ], + "key": { + "W": { + "tag": "minecraft:wool" + }, + "X": { + "tag": "forge:ingots/brass" + } }, - "X": { - "tag": "forge:ingots/brass" - } - }, - "result": { - "item": "basemetals:brass_horse_armor" - }, - "group": "basemetals:brass_horse_armor" + "result": { + "item": "basemetals:brass_horse_armor" + }, + "group": "basemetals:brass_horse_armor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/brass_ingot_from_nuggets.json index e5f31569..345ec07f 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/brass_ingot_from_nuggets.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:nuggets/brass" - } - }, - "result": { - "item": "basemetals:brass_ingot" - }, - "group": "basemetals:brass_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:nuggets/brass" + } + }, + "result": { + "item": "basemetals:brass_ingot" + }, + "group": "basemetals:brass_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_leggings.json b/src/generated/resources/data/basemetals/recipes/brass_leggings.json index fa471754..73689ab3 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/brass_leggings.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/brass" - } - }, - "result": { - "item": "basemetals:brass_leggings" - }, - "group": "basemetals:brass_leggings" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/brass" + } + }, + "result": { + "item": "basemetals:brass_leggings" + }, + "group": "basemetals:brass_leggings" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_lever.json b/src/generated/resources/data/basemetals/recipes/brass_lever.json index 8bf52880..fa4ee1f6 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_lever.json +++ b/src/generated/resources/data/basemetals/recipes/brass_lever.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "X" - ], - "key": { - "R": { - "tag": "forge:rods/brass" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "X" + ], + "key": { + "R": { + "tag": "forge:rods/brass" + }, + "X": { + "tag": "forge:ingots/brass" + } }, - "X": { - "tag": "forge:ingots/brass" - } - }, - "result": { - "item": "basemetals:brass_lever" - }, - "group": "basemetals:brass_lever" + "result": { + "item": "basemetals:brass_lever" + }, + "group": "basemetals:brass_lever" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_nuggets.json b/src/generated/resources/data/basemetals/recipes/brass_nuggets.json index 726a949c..3073aedb 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/brass_nuggets.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:ingots/brass" - } - ], - "result": { - "item": "basemetals:brass_nugget", - "count": 9 - }, - "group": "basemetals:brass_nugget" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/brass" + } + ], + "result": { + "item": "basemetals:brass_nugget", + "count": 9 + }, + "group": "basemetals:brass_nugget" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_pickaxe.json b/src/generated/resources/data/basemetals/recipes/brass_pickaxe.json index 34ed1802..a58e3a55 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/brass_pickaxe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " S ", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " S ", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/brass" + } }, - "X": { - "tag": "forge:ingots/brass" - } - }, - "result": { - "item": "basemetals:brass_pickaxe" - }, - "group": "basemetals:brass_pickaxe" + "result": { + "item": "basemetals:brass_pickaxe" + }, + "group": "basemetals:brass_pickaxe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_plate.json b/src/generated/resources/data/basemetals/recipes/brass_plate.json index 1113ca79..d1bb4c3a 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_plate.json +++ b/src/generated/resources/data/basemetals/recipes/brass_plate.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/brass" - } - }, - "result": { - "item": "basemetals:brass_plate", - "count": 3 - }, - "group": "basemetals:brass_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/brass" + } + }, + "result": { + "item": "basemetals:brass_plate", + "count": 3 + }, + "group": "basemetals:brass_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/brass_powder_from_small.json index 62d14cd7..8c6ad550 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/brass_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/brass" - } - }, - "result": { - "item": "basemetals:brass_powder" - }, - "group": "basemetals:brass_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/brass" + } + }, + "result": { + "item": "basemetals:brass_powder" + }, + "group": "basemetals:brass_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/brass_pressure_plate.json index ce72c7a0..8e78c1af 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/brass_pressure_plate.json @@ -1,15 +1,18 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/brass" - } - }, - "result": { - "item": "basemetals:brass_pressure_plate" - }, - "group": "basemetals:brass_pressure_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/brass" + } + }, + "result": { + "item": "basemetals:brass_pressure_plate" + }, + "group": "basemetals:brass_pressure_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_rod.json b/src/generated/resources/data/basemetals/recipes/brass_rod.json index f3c24cf7..e4a61b4b 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_rod.json +++ b/src/generated/resources/data/basemetals/recipes/brass_rod.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:ingots/brass" - } - }, - "result": { - "item": "basemetals:brass_rod", - "count": 4 - }, - "group": "basemetals:brass_rod" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:ingots/brass" + } + }, + "result": { + "item": "basemetals:brass_rod", + "count": 4 + }, + "group": "basemetals:brass_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_scythe.json b/src/generated/resources/data/basemetals/recipes/brass_scythe.json index bbafd783..a8aa3f81 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/brass_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/brass" + } }, - "X": { - "tag": "forge:ingots/brass" - } - }, - "result": { - "item": "basemetals:brass_scythe" - }, - "group": "basemetals:brass_scythe" + "result": { + "item": "basemetals:brass_scythe" + }, + "group": "basemetals:brass_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_shears.json b/src/generated/resources/data/basemetals/recipes/brass_shears.json index 99c2c2db..77566249 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_shears.json +++ b/src/generated/resources/data/basemetals/recipes/brass_shears.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "X " - ], - "key": { - "X": { - "tag": "forge:ingots/brass" - } - }, - "result": { - "item": "basemetals:brass_shears" - }, - "group": "basemetals:brass_shears" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "X " + ], + "key": { + "X": { + "tag": "forge:ingots/brass" + } + }, + "result": { + "item": "basemetals:brass_shears" + }, + "group": "basemetals:brass_shears" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_shield.json b/src/generated/resources/data/basemetals/recipes/brass_shield.json index 3a82c66f..f363296f 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_shield.json +++ b/src/generated/resources/data/basemetals/recipes/brass_shield.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XWX", - "XXX", - " X " - ], - "key": { - "W": { - "tag": "minecraft:planks" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XWX", + "XXX", + " X " + ], + "key": { + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:ingots/brass" + } }, - "X": { - "tag": "forge:ingots/brass" - } - }, - "result": { - "item": "basemetals:brass_shield" - }, - "group": "basemetals:brass_shield" + "result": { + "item": "basemetals:brass_shield" + }, + "group": "basemetals:brass_shield" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_shovel.json b/src/generated/resources/data/basemetals/recipes/brass_shovel.json index 577b4af9..9a1a83bf 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/brass_shovel.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/brass" + } }, - "X": { - "tag": "forge:ingots/brass" - } - }, - "result": { - "item": "basemetals:brass_shovel" - }, - "group": "basemetals:brass_shovel" + "result": { + "item": "basemetals:brass_shovel" + }, + "group": "basemetals:brass_shovel" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_slab.json b/src/generated/resources/data/basemetals/recipes/brass_slab.json index b7efdef0..cbf166d3 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_slab.json +++ b/src/generated/resources/data/basemetals/recipes/brass_slab.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/brass" - } - }, - "result": { - "item": "basemetals:brass_slab", - "count": 6 - }, - "group": "basemetals:brass_slab" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/brass" + } + }, + "result": { + "item": "basemetals:brass_slab", + "count": 6 + }, + "group": "basemetals:brass_slab" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_smallblend.json b/src/generated/resources/data/basemetals/recipes/brass_smallblend.json index 5df78e88..fbdee08f 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_smallblend.json +++ b/src/generated/resources/data/basemetals/recipes/brass_smallblend.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:blends/brass" - } - ], - "result": { - "item": "basemetals:brass_smallblend", - "count": 9 - }, - "group": "basemetals:brass_smallblend" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:blends/brass" + } + ], + "result": { + "item": "basemetals:brass_smallblend", + "count": 9 + }, + "group": "basemetals:brass_smallblend" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_smallpowder.json b/src/generated/resources/data/basemetals/recipes/brass_smallpowder.json index 7cd6822f..dacbed8f 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/brass_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/brass" - } - ], - "result": { - "item": "basemetals:brass_smallpowder", - "count": 9 - }, - "group": "basemetals:brass_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/brass" + } + ], + "result": { + "item": "basemetals:brass_smallpowder", + "count": 9 + }, + "group": "basemetals:brass_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_stairs.json b/src/generated/resources/data/basemetals/recipes/brass_stairs.json index 42bd8daf..4d7e29fc 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/brass_stairs.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X ", - "XX ", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/brass" - } - }, - "result": { - "item": "basemetals:brass_stairs", - "count": 4 - }, - "group": "basemetals:brass_stairs" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/brass" + } + }, + "result": { + "item": "basemetals:brass_stairs", + "count": 4 + }, + "group": "basemetals:brass_stairs" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_sword.json b/src/generated/resources/data/basemetals/recipes/brass_sword.json index 010b579b..a04b7f41 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_sword.json +++ b/src/generated/resources/data/basemetals/recipes/brass_sword.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/brass" + } }, - "X": { - "tag": "forge:ingots/brass" - } - }, - "result": { - "item": "basemetals:brass_sword" - }, - "group": "basemetals:brass_sword" + "result": { + "item": "basemetals:brass_sword" + }, + "group": "basemetals:brass_sword" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_trapdoor.json b/src/generated/resources/data/basemetals/recipes/brass_trapdoor.json index 3029b04c..511e4860 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/brass_trapdoor.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/brass" - } - }, - "result": { - "item": "basemetals:brass_trapdoor" - }, - "group": "basemetals:brass_trapdoor" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/brass" + } + }, + "result": { + "item": "basemetals:brass_trapdoor" + }, + "group": "basemetals:brass_trapdoor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/brass_wall.json b/src/generated/resources/data/basemetals/recipes/brass_wall.json index 8cba6219..8af7652b 100644 --- a/src/generated/resources/data/basemetals/recipes/brass_wall.json +++ b/src/generated/resources/data/basemetals/recipes/brass_wall.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/brass" - } - }, - "result": { - "item": "basemetals:brass_wall", - "count": 6 - }, - "group": "basemetals:brass_wall" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/brass" + } + }, + "result": { + "item": "basemetals:brass_wall", + "count": 6 + }, + "group": "basemetals:brass_wall" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_arrow.json b/src/generated/resources/data/basemetals/recipes/bronze_arrow.json index 4b0fafaa..8022518c 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_arrow.json @@ -1,24 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "N", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "N", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "N": { + "tag": "forge:nuggets/bronze" + }, + "R": { + "tag": "forge:rods/bronze" + } }, - "N": { - "tag": "forge:nuggets/bronze" + "result": { + "item": "basemetals:bronze_arrow", + "count": 4 }, - "R": { - "tag": "forge:rods/bronze" - } - }, - "result": { - "item": "basemetals:bronze_arrow", - "count": 4 - }, - "group": "basemetals:bronze_arrow" + "group": "basemetals:bronze_arrow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_axe.json b/src/generated/resources/data/basemetals/recipes/bronze_axe.json index 73e9d1b9..a6dde72a 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_axe.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_axe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XS", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XS", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/bronze" + } }, - "X": { - "tag": "forge:ingots/bronze" - } - }, - "result": { - "item": "basemetals:bronze_axe" - }, - "group": "basemetals:bronze_axe" + "result": { + "item": "basemetals:bronze_axe" + }, + "group": "basemetals:bronze_axe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_bars.json b/src/generated/resources/data/basemetals/recipes/bronze_bars.json index 2c3c134c..bfb45c70 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_bars.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_bars.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/bronze" - } - }, - "result": { - "item": "basemetals:bronze_bars", - "count": 16 - }, - "group": "basemetals:bronze_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/bronze" + } + }, + "result": { + "item": "basemetals:bronze_bars", + "count": 16 + }, + "group": "basemetals:bronze_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_bars_2.json b/src/generated/resources/data/basemetals/recipes/bronze_bars_2.json index 97c4c185..a5daa85b 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_bars_2.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:rods/bronze" - } - }, - "result": { - "item": "basemetals:bronze_bars", - "count": 4 - }, - "group": "basemetals:bronze_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:rods/bronze" + } + }, + "result": { + "item": "basemetals:bronze_bars", + "count": 4 + }, + "group": "basemetals:bronze_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_blend.json b/src/generated/resources/data/basemetals/recipes/bronze_blend.json index 5a265af1..3310c211 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_blend.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_blend.json @@ -1,22 +1,25 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/copper" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/copper" + }, + { + "tag": "forge:dusts/copper" + }, + { + "tag": "forge:dusts/copper" + }, + { + "tag": "forge:dusts/tin" + } + ], + "result": { + "item": "basemetals:bronze_blend", + "count": 4 }, - { - "tag": "forge:dusts/copper" - }, - { - "tag": "forge:dusts/copper" - }, - { - "tag": "forge:dusts/tin" - } - ], - "result": { - "item": "basemetals:bronze_blend", - "count": 4 - }, - "group": "basemetals:bronze_blend" + "group": "basemetals:bronze_blend" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_blend_from_small.json b/src/generated/resources/data/basemetals/recipes/bronze_blend_from_small.json index 6d755fee..103ac833 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_blend_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_blend_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:small_blends/bronze" - } - }, - "result": { - "item": "basemetals:bronze_blend" - }, - "group": "basemetals:bronze_blend" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:small_blends/bronze" + } + }, + "result": { + "item": "basemetals:bronze_blend" + }, + "group": "basemetals:bronze_blend" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_block.json b/src/generated/resources/data/basemetals/recipes/bronze_block.json index 4cee9dd3..78d94c14 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_block.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_block.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/bronze" - } - }, - "result": { - "item": "basemetals:bronze_block" - }, - "group": "basemetals:bronze_block" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/bronze" + } + }, + "result": { + "item": "basemetals:bronze_block" + }, + "group": "basemetals:bronze_block" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_block_ingot.json b/src/generated/resources/data/basemetals/recipes/bronze_block_ingot.json index c6bf61ef..640a8026 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_block_ingot.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/bronze" - } - ], - "result": { - "item": "basemetals:bronze_ingot", - "count": 9 - }, - "group": "basemetals:bronze_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/bronze" + } + ], + "result": { + "item": "basemetals:bronze_ingot", + "count": 9 + }, + "group": "basemetals:bronze_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_bolt.json b/src/generated/resources/data/basemetals/recipes/bronze_bolt.json index 39b8104a..165afade 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_bolt.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "R": { + "tag": "forge:rods/bronze" + } }, - "R": { - "tag": "forge:rods/bronze" - } - }, - "result": { - "item": "basemetals:bronze_bolt", - "count": 4 - }, - "group": "basemetals:bronze_bolt" + "result": { + "item": "basemetals:bronze_bolt", + "count": 4 + }, + "group": "basemetals:bronze_bolt" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_boots.json b/src/generated/resources/data/basemetals/recipes/bronze_boots.json index 0b2c5d93..a455d0c7 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_boots.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_boots.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/bronze" - } - }, - "result": { - "item": "basemetals:bronze_boots" - }, - "group": "basemetals:bronze_boots" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/bronze" + } + }, + "result": { + "item": "basemetals:bronze_boots" + }, + "group": "basemetals:bronze_boots" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_bow.json b/src/generated/resources/data/basemetals/recipes/bronze_bow.json index 50f04f6d..b2b67200 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_bow.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_bow.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " RS", - "R S", - " RS" - ], - "key": { - "R": { - "tag": "forge:rods/bronze" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " RS", + "R S", + " RS" + ], + "key": { + "R": { + "tag": "forge:rods/bronze" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:bronze_bow" - }, - "group": "basemetals:bronze_bow" + "result": { + "item": "basemetals:bronze_bow" + }, + "group": "basemetals:bronze_bow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_button.json b/src/generated/resources/data/basemetals/recipes/bronze_button.json index 83cd2baf..edb5d1f6 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_button.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_button.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:nuggets/bronze" - } - }, - "result": { - "item": "basemetals:bronze_button" - }, - "group": "basemetals:bronze_button" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:nuggets/bronze" + } + }, + "result": { + "item": "basemetals:bronze_button" + }, + "group": "basemetals:bronze_button" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_chestplate.json b/src/generated/resources/data/basemetals/recipes/bronze_chestplate.json index 877522e6..a7ae4f57 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_chestplate.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/bronze" - } - }, - "result": { - "item": "basemetals:bronze_chestplate" - }, - "group": "basemetals:bronze_chestplate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/bronze" + } + }, + "result": { + "item": "basemetals:bronze_chestplate" + }, + "group": "basemetals:bronze_chestplate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_crackhammer.json b/src/generated/resources/data/basemetals/recipes/bronze_crackhammer.json index ab0ea45c..b2ef46af 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:storage_blocks/bronze" + } }, - "X": { - "tag": "forge:storage_blocks/bronze" - } - }, - "result": { - "item": "basemetals:bronze_crackhammer" - }, - "group": "basemetals:bronze_crackhammer" + "result": { + "item": "basemetals:bronze_crackhammer" + }, + "group": "basemetals:bronze_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_crossbow.json b/src/generated/resources/data/basemetals/recipes/bronze_crossbow.json index ffb8e751..9c357605 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_crossbow.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRR", - " SR", - "R G" - ], - "key": { - "G": { - "tag": "forge:gears/bronze" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRR", + " SR", + "R G" + ], + "key": { + "G": { + "tag": "forge:gears/bronze" + }, + "R": { + "tag": "forge:rods/bronze" + }, + "S": { + "item": "minecraft:string" + } }, - "R": { - "tag": "forge:rods/bronze" + "result": { + "item": "basemetals:bronze_crossbow" }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:bronze_crossbow" - }, - "group": "basemetals:bronze_crossbow" + "group": "basemetals:bronze_crossbow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_door.json b/src/generated/resources/data/basemetals/recipes/bronze_door.json index f7a6d5ad..cfd2e984 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_door.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_door.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/bronze" - } - }, - "result": { - "item": "basemetals:bronze_door", - "count": 3 - }, - "group": "basemetals:bronze_door" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/bronze" + } + }, + "result": { + "item": "basemetals:bronze_door", + "count": 3 + }, + "group": "basemetals:bronze_door" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_fishingrod.json b/src/generated/resources/data/basemetals/recipes/bronze_fishingrod.json index 1ac36af5..55322927 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_fishingrod.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " R", - " RS", - "R S" - ], - "key": { - "R": { - "tag": "forge:rods/bronze" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " R", + " RS", + "R S" + ], + "key": { + "R": { + "tag": "forge:rods/bronze" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:bronze_fishing_rod" - }, - "group": "basemetals:bronze_fishing_rod" + "result": { + "item": "basemetals:bronze_fishing_rod" + }, + "group": "basemetals:bronze_fishing_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_gear.json b/src/generated/resources/data/basemetals/recipes/bronze_gear.json index 8eaa9c19..5d247cc4 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_gear.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_gear.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "XRX", - " X " - ], - "key": { - "R": { - "tag": "forge:rods/bronze" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XRX", + " X " + ], + "key": { + "R": { + "tag": "forge:rods/bronze" + }, + "X": { + "tag": "forge:ingots/bronze" + } }, - "X": { - "tag": "forge:ingots/bronze" - } - }, - "result": { - "item": "basemetals:bronze_gear", - "count": 4 - }, - "group": "basemetals:bronze_gear" + "result": { + "item": "basemetals:bronze_gear", + "count": 4 + }, + "group": "basemetals:bronze_gear" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_helmet.json b/src/generated/resources/data/basemetals/recipes/bronze_helmet.json index 2339f3bf..63abb177 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_helmet.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/bronze" - } - }, - "result": { - "item": "basemetals:bronze_helmet" - }, - "group": "basemetals:bronze_helmet" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/bronze" + } + }, + "result": { + "item": "basemetals:bronze_helmet" + }, + "group": "basemetals:bronze_helmet" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_hoe.json b/src/generated/resources/data/basemetals/recipes/bronze_hoe.json index 90e787a4..a7800286 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_hoe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - " S", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " S", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/bronze" + } }, - "X": { - "tag": "forge:ingots/bronze" - } - }, - "result": { - "item": "basemetals:bronze_hoe" - }, - "group": "basemetals:bronze_hoe" + "result": { + "item": "basemetals:bronze_hoe" + }, + "group": "basemetals:bronze_hoe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_horsearmor.json b/src/generated/resources/data/basemetals/recipes/bronze_horsearmor.json index 7642208d..59baa903 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_horsearmor.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "XWX", - "XXX" - ], - "key": { - "W": { - "tag": "minecraft:wool" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "XWX", + "XXX" + ], + "key": { + "W": { + "tag": "minecraft:wool" + }, + "X": { + "tag": "forge:ingots/bronze" + } }, - "X": { - "tag": "forge:ingots/bronze" - } - }, - "result": { - "item": "basemetals:bronze_horse_armor" - }, - "group": "basemetals:bronze_horse_armor" + "result": { + "item": "basemetals:bronze_horse_armor" + }, + "group": "basemetals:bronze_horse_armor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/bronze_ingot_from_nuggets.json index b6d7a3fc..771856a4 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_ingot_from_nuggets.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:nuggets/bronze" - } - }, - "result": { - "item": "basemetals:bronze_ingot" - }, - "group": "basemetals:bronze_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:nuggets/bronze" + } + }, + "result": { + "item": "basemetals:bronze_ingot" + }, + "group": "basemetals:bronze_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_leggings.json b/src/generated/resources/data/basemetals/recipes/bronze_leggings.json index 14691d34..6734bf49 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_leggings.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/bronze" - } - }, - "result": { - "item": "basemetals:bronze_leggings" - }, - "group": "basemetals:bronze_leggings" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/bronze" + } + }, + "result": { + "item": "basemetals:bronze_leggings" + }, + "group": "basemetals:bronze_leggings" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_lever.json b/src/generated/resources/data/basemetals/recipes/bronze_lever.json index b1532b7a..2b5fa0c5 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_lever.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_lever.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "X" - ], - "key": { - "R": { - "tag": "forge:rods/bronze" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "X" + ], + "key": { + "R": { + "tag": "forge:rods/bronze" + }, + "X": { + "tag": "forge:ingots/bronze" + } }, - "X": { - "tag": "forge:ingots/bronze" - } - }, - "result": { - "item": "basemetals:bronze_lever" - }, - "group": "basemetals:bronze_lever" + "result": { + "item": "basemetals:bronze_lever" + }, + "group": "basemetals:bronze_lever" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_nuggets.json b/src/generated/resources/data/basemetals/recipes/bronze_nuggets.json index 86a0b24b..f38dc621 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_nuggets.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:ingots/bronze" - } - ], - "result": { - "item": "basemetals:bronze_nugget", - "count": 9 - }, - "group": "basemetals:bronze_nugget" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/bronze" + } + ], + "result": { + "item": "basemetals:bronze_nugget", + "count": 9 + }, + "group": "basemetals:bronze_nugget" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_pickaxe.json b/src/generated/resources/data/basemetals/recipes/bronze_pickaxe.json index 6c88cad6..40a00f71 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_pickaxe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " S ", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " S ", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/bronze" + } }, - "X": { - "tag": "forge:ingots/bronze" - } - }, - "result": { - "item": "basemetals:bronze_pickaxe" - }, - "group": "basemetals:bronze_pickaxe" + "result": { + "item": "basemetals:bronze_pickaxe" + }, + "group": "basemetals:bronze_pickaxe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_plate.json b/src/generated/resources/data/basemetals/recipes/bronze_plate.json index 8c496d9c..d0d7ac0f 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_plate.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_plate.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/bronze" - } - }, - "result": { - "item": "basemetals:bronze_plate", - "count": 3 - }, - "group": "basemetals:bronze_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/bronze" + } + }, + "result": { + "item": "basemetals:bronze_plate", + "count": 3 + }, + "group": "basemetals:bronze_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/bronze_powder_from_small.json index 2fb2321c..cba60e48 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/bronze" - } - }, - "result": { - "item": "basemetals:bronze_powder" - }, - "group": "basemetals:bronze_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/bronze" + } + }, + "result": { + "item": "basemetals:bronze_powder" + }, + "group": "basemetals:bronze_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/bronze_pressure_plate.json index 574482cb..1eebd3d2 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_pressure_plate.json @@ -1,15 +1,18 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/bronze" - } - }, - "result": { - "item": "basemetals:bronze_pressure_plate" - }, - "group": "basemetals:bronze_pressure_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/bronze" + } + }, + "result": { + "item": "basemetals:bronze_pressure_plate" + }, + "group": "basemetals:bronze_pressure_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_rod.json b/src/generated/resources/data/basemetals/recipes/bronze_rod.json index 7dd907c3..f2244c52 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_rod.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_rod.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:ingots/bronze" - } - }, - "result": { - "item": "basemetals:bronze_rod", - "count": 4 - }, - "group": "basemetals:bronze_rod" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:ingots/bronze" + } + }, + "result": { + "item": "basemetals:bronze_rod", + "count": 4 + }, + "group": "basemetals:bronze_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_scythe.json b/src/generated/resources/data/basemetals/recipes/bronze_scythe.json index cf6a80f3..aa041877 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/bronze" + } }, - "X": { - "tag": "forge:ingots/bronze" - } - }, - "result": { - "item": "basemetals:bronze_scythe" - }, - "group": "basemetals:bronze_scythe" + "result": { + "item": "basemetals:bronze_scythe" + }, + "group": "basemetals:bronze_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_shears.json b/src/generated/resources/data/basemetals/recipes/bronze_shears.json index 3ab9b705..f423f40d 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_shears.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_shears.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "X " - ], - "key": { - "X": { - "tag": "forge:ingots/bronze" - } - }, - "result": { - "item": "basemetals:bronze_shears" - }, - "group": "basemetals:bronze_shears" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "X " + ], + "key": { + "X": { + "tag": "forge:ingots/bronze" + } + }, + "result": { + "item": "basemetals:bronze_shears" + }, + "group": "basemetals:bronze_shears" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_shield.json b/src/generated/resources/data/basemetals/recipes/bronze_shield.json index 2477be02..104e6166 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_shield.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_shield.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XWX", - "XXX", - " X " - ], - "key": { - "W": { - "tag": "minecraft:planks" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XWX", + "XXX", + " X " + ], + "key": { + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:ingots/bronze" + } }, - "X": { - "tag": "forge:ingots/bronze" - } - }, - "result": { - "item": "basemetals:bronze_shield" - }, - "group": "basemetals:bronze_shield" + "result": { + "item": "basemetals:bronze_shield" + }, + "group": "basemetals:bronze_shield" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_shovel.json b/src/generated/resources/data/basemetals/recipes/bronze_shovel.json index 3f053d1c..d4cc1325 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_shovel.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/bronze" + } }, - "X": { - "tag": "forge:ingots/bronze" - } - }, - "result": { - "item": "basemetals:bronze_shovel" - }, - "group": "basemetals:bronze_shovel" + "result": { + "item": "basemetals:bronze_shovel" + }, + "group": "basemetals:bronze_shovel" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_slab.json b/src/generated/resources/data/basemetals/recipes/bronze_slab.json index 22e0b5ac..b43aa6ce 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_slab.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_slab.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/bronze" - } - }, - "result": { - "item": "basemetals:bronze_slab", - "count": 6 - }, - "group": "basemetals:bronze_slab" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/bronze" + } + }, + "result": { + "item": "basemetals:bronze_slab", + "count": 6 + }, + "group": "basemetals:bronze_slab" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_smallblend.json b/src/generated/resources/data/basemetals/recipes/bronze_smallblend.json index 2776a399..bc1e6410 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_smallblend.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_smallblend.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:blends/bronze" - } - ], - "result": { - "item": "basemetals:bronze_smallblend", - "count": 9 - }, - "group": "basemetals:bronze_smallblend" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:blends/bronze" + } + ], + "result": { + "item": "basemetals:bronze_smallblend", + "count": 9 + }, + "group": "basemetals:bronze_smallblend" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_smallpowder.json b/src/generated/resources/data/basemetals/recipes/bronze_smallpowder.json index 22b95132..5acef8c0 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/bronze" - } - ], - "result": { - "item": "basemetals:bronze_smallpowder", - "count": 9 - }, - "group": "basemetals:bronze_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/bronze" + } + ], + "result": { + "item": "basemetals:bronze_smallpowder", + "count": 9 + }, + "group": "basemetals:bronze_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_stairs.json b/src/generated/resources/data/basemetals/recipes/bronze_stairs.json index 65999a9c..f1fc7fdc 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_stairs.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X ", - "XX ", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/bronze" - } - }, - "result": { - "item": "basemetals:bronze_stairs", - "count": 4 - }, - "group": "basemetals:bronze_stairs" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/bronze" + } + }, + "result": { + "item": "basemetals:bronze_stairs", + "count": 4 + }, + "group": "basemetals:bronze_stairs" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_sword.json b/src/generated/resources/data/basemetals/recipes/bronze_sword.json index f7999680..2b6d0ce6 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_sword.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_sword.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/bronze" + } }, - "X": { - "tag": "forge:ingots/bronze" - } - }, - "result": { - "item": "basemetals:bronze_sword" - }, - "group": "basemetals:bronze_sword" + "result": { + "item": "basemetals:bronze_sword" + }, + "group": "basemetals:bronze_sword" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_trapdoor.json b/src/generated/resources/data/basemetals/recipes/bronze_trapdoor.json index 7d1e77eb..19ffb567 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_trapdoor.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/bronze" - } - }, - "result": { - "item": "basemetals:bronze_trapdoor" - }, - "group": "basemetals:bronze_trapdoor" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/bronze" + } + }, + "result": { + "item": "basemetals:bronze_trapdoor" + }, + "group": "basemetals:bronze_trapdoor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/bronze_wall.json b/src/generated/resources/data/basemetals/recipes/bronze_wall.json index fe254bdf..a7764b34 100644 --- a/src/generated/resources/data/basemetals/recipes/bronze_wall.json +++ b/src/generated/resources/data/basemetals/recipes/bronze_wall.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/bronze" - } - }, - "result": { - "item": "basemetals:bronze_wall", - "count": 6 - }, - "group": "basemetals:bronze_wall" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/bronze" + } + }, + "result": { + "item": "basemetals:bronze_wall", + "count": 6 + }, + "group": "basemetals:bronze_wall" + } } diff --git a/src/generated/resources/data/basemetals/recipes/charcoal_block.json b/src/generated/resources/data/basemetals/recipes/charcoal_block.json index ed69c5bb..4772b427 100644 --- a/src/generated/resources/data/basemetals/recipes/charcoal_block.json +++ b/src/generated/resources/data/basemetals/recipes/charcoal_block.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "item": "minecraft:charcoal" - } - }, - "result": { - "item": "basemetals:charcoal_block" - }, - "group": "basemetals:charcoal_block" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "item": "minecraft:charcoal" + } + }, + "result": { + "item": "basemetals:charcoal_block" + }, + "group": "basemetals:charcoal_block" + } } diff --git a/src/generated/resources/data/basemetals/recipes/charcoal_block_dust.json b/src/generated/resources/data/basemetals/recipes/charcoal_block_dust.json index 2f45f6bc..ec700a6b 100644 --- a/src/generated/resources/data/basemetals/recipes/charcoal_block_dust.json +++ b/src/generated/resources/data/basemetals/recipes/charcoal_block_dust.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:dusts/charcoal" - } - }, - "result": { - "item": "basemetals:charcoal_block" - }, - "group": "basemetals:charcoal_block" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:dusts/charcoal" + } + }, + "result": { + "item": "basemetals:charcoal_block" + }, + "group": "basemetals:charcoal_block" + } } diff --git a/src/generated/resources/data/basemetals/recipes/charcoal_ingot.json b/src/generated/resources/data/basemetals/recipes/charcoal_ingot.json index 5081623f..308e1e17 100644 --- a/src/generated/resources/data/basemetals/recipes/charcoal_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/charcoal_ingot.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:nuggets/charcoal" - } - }, - "result": { - "item": "minecraft:charcoal" - }, - "group": "minecraft:charcoal" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:nuggets/charcoal" + } + }, + "result": { + "item": "minecraft:charcoal" + }, + "group": "minecraft:charcoal" + } } diff --git a/src/generated/resources/data/basemetals/recipes/charcoal_nugget.json b/src/generated/resources/data/basemetals/recipes/charcoal_nugget.json index 6d83c819..cb00ce46 100644 --- a/src/generated/resources/data/basemetals/recipes/charcoal_nugget.json +++ b/src/generated/resources/data/basemetals/recipes/charcoal_nugget.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:charcoal" - } - ], - "result": { - "item": "basemetals:charcoal_nugget", - "count": 9 - }, - "group": "basemetals:charcoal_nugget" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:charcoal" + } + ], + "result": { + "item": "basemetals:charcoal_nugget", + "count": 9 + }, + "group": "basemetals:charcoal_nugget" + } } diff --git a/src/generated/resources/data/basemetals/recipes/charcoal_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/charcoal_powder_from_small.json index 656435e7..49c6f5ca 100644 --- a/src/generated/resources/data/basemetals/recipes/charcoal_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/charcoal_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/charcoal" - } - }, - "result": { - "item": "basemetals:charcoal_powder" - }, - "group": "basemetals:charcoal_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/charcoal" + } + }, + "result": { + "item": "basemetals:charcoal_powder" + }, + "group": "basemetals:charcoal_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/charcoal_smallpowder.json b/src/generated/resources/data/basemetals/recipes/charcoal_smallpowder.json index 289527b4..05a524fd 100644 --- a/src/generated/resources/data/basemetals/recipes/charcoal_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/charcoal_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/charcoal" - } - ], - "result": { - "item": "basemetals:charcoal_smallpowder", - "count": 9 - }, - "group": "basemetals:charcoal_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/charcoal" + } + ], + "result": { + "item": "basemetals:charcoal_smallpowder", + "count": 9 + }, + "group": "basemetals:charcoal_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coal_block_dust.json b/src/generated/resources/data/basemetals/recipes/coal_block_dust.json index e66150c2..2fa54f27 100644 --- a/src/generated/resources/data/basemetals/recipes/coal_block_dust.json +++ b/src/generated/resources/data/basemetals/recipes/coal_block_dust.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:dusts/coal" - } - }, - "result": { - "item": "minecraft:coal_block" - }, - "group": "minecraft:coal_block" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:dusts/coal" + } + }, + "result": { + "item": "minecraft:coal_block" + }, + "group": "minecraft:coal_block" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coal_ingot.json b/src/generated/resources/data/basemetals/recipes/coal_ingot.json index 36fac2e6..51cd7472 100644 --- a/src/generated/resources/data/basemetals/recipes/coal_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/coal_ingot.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:nuggets/coal" - } - }, - "result": { - "item": "minecraft:coal" - }, - "group": "minecraft:coal" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:nuggets/coal" + } + }, + "result": { + "item": "minecraft:coal" + }, + "group": "minecraft:coal" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coal_nugget.json b/src/generated/resources/data/basemetals/recipes/coal_nugget.json index 60a52e47..cd812e2d 100644 --- a/src/generated/resources/data/basemetals/recipes/coal_nugget.json +++ b/src/generated/resources/data/basemetals/recipes/coal_nugget.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:coal" - } - ], - "result": { - "item": "basemetals:coal_nugget", - "count": 9 - }, - "group": "basemetals:coal_nugget" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:coal" + } + ], + "result": { + "item": "basemetals:coal_nugget", + "count": 9 + }, + "group": "basemetals:coal_nugget" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coal_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/coal_powder_from_small.json index 1b82ab5c..e6d46fb3 100644 --- a/src/generated/resources/data/basemetals/recipes/coal_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/coal_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/coal" - } - }, - "result": { - "item": "basemetals:coal_powder" - }, - "group": "basemetals:coal_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/coal" + } + }, + "result": { + "item": "basemetals:coal_powder" + }, + "group": "basemetals:coal_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coal_smallpowder.json b/src/generated/resources/data/basemetals/recipes/coal_smallpowder.json index c9cb3b23..806d57c4 100644 --- a/src/generated/resources/data/basemetals/recipes/coal_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/coal_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/coal" - } - ], - "result": { - "item": "basemetals:coal_smallpowder", - "count": 9 - }, - "group": "basemetals:coal_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/coal" + } + ], + "result": { + "item": "basemetals:coal_smallpowder", + "count": 9 + }, + "group": "basemetals:coal_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_arrow.json b/src/generated/resources/data/basemetals/recipes/coldiron_arrow.json index 3d4adab4..217b436f 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_arrow.json @@ -1,24 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "N", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "N", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "N": { + "tag": "forge:nuggets/coldiron" + }, + "R": { + "tag": "forge:rods/coldiron" + } }, - "N": { - "tag": "forge:nuggets/coldiron" + "result": { + "item": "basemetals:coldiron_arrow", + "count": 4 }, - "R": { - "tag": "forge:rods/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_arrow", - "count": 4 - }, - "group": "basemetals:coldiron_arrow" + "group": "basemetals:coldiron_arrow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_axe.json b/src/generated/resources/data/basemetals/recipes/coldiron_axe.json index 5e72eb81..6358ff8c 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_axe.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_axe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XS", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XS", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/coldiron" + } }, - "X": { - "tag": "forge:ingots/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_axe" - }, - "group": "basemetals:coldiron_axe" + "result": { + "item": "basemetals:coldiron_axe" + }, + "group": "basemetals:coldiron_axe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_bars.json b/src/generated/resources/data/basemetals/recipes/coldiron_bars.json index fbc52d43..fa44867a 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_bars.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_bars.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_bars", - "count": 16 - }, - "group": "basemetals:coldiron_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/coldiron" + } + }, + "result": { + "item": "basemetals:coldiron_bars", + "count": 16 + }, + "group": "basemetals:coldiron_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_bars_2.json b/src/generated/resources/data/basemetals/recipes/coldiron_bars_2.json index d7baadab..6498d428 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_bars_2.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:rods/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_bars", - "count": 4 - }, - "group": "basemetals:coldiron_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:rods/coldiron" + } + }, + "result": { + "item": "basemetals:coldiron_bars", + "count": 4 + }, + "group": "basemetals:coldiron_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_block.json b/src/generated/resources/data/basemetals/recipes/coldiron_block.json index 5b923280..a5136091 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_block.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_block.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_block" - }, - "group": "basemetals:coldiron_block" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/coldiron" + } + }, + "result": { + "item": "basemetals:coldiron_block" + }, + "group": "basemetals:coldiron_block" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_block_ingot.json b/src/generated/resources/data/basemetals/recipes/coldiron_block_ingot.json index 50331480..27d5f301 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_block_ingot.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/coldiron" - } - ], - "result": { - "item": "basemetals:coldiron_ingot", - "count": 9 - }, - "group": "basemetals:coldiron_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/coldiron" + } + ], + "result": { + "item": "basemetals:coldiron_ingot", + "count": 9 + }, + "group": "basemetals:coldiron_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_bolt.json b/src/generated/resources/data/basemetals/recipes/coldiron_bolt.json index 6d457790..07d6ea7f 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_bolt.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "R": { + "tag": "forge:rods/coldiron" + } }, - "R": { - "tag": "forge:rods/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_bolt", - "count": 4 - }, - "group": "basemetals:coldiron_bolt" + "result": { + "item": "basemetals:coldiron_bolt", + "count": 4 + }, + "group": "basemetals:coldiron_bolt" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_boots.json b/src/generated/resources/data/basemetals/recipes/coldiron_boots.json index a2620261..170bebb7 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_boots.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_boots.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_boots" - }, - "group": "basemetals:coldiron_boots" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/coldiron" + } + }, + "result": { + "item": "basemetals:coldiron_boots" + }, + "group": "basemetals:coldiron_boots" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_bow.json b/src/generated/resources/data/basemetals/recipes/coldiron_bow.json index 02de5d49..bc7d4fd1 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_bow.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_bow.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " RS", - "R S", - " RS" - ], - "key": { - "R": { - "tag": "forge:rods/coldiron" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " RS", + "R S", + " RS" + ], + "key": { + "R": { + "tag": "forge:rods/coldiron" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:coldiron_bow" - }, - "group": "basemetals:coldiron_bow" + "result": { + "item": "basemetals:coldiron_bow" + }, + "group": "basemetals:coldiron_bow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_button.json b/src/generated/resources/data/basemetals/recipes/coldiron_button.json index ba4ae4cc..b9ebaf7d 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_button.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_button.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:nuggets/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_button" - }, - "group": "basemetals:coldiron_button" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:nuggets/coldiron" + } + }, + "result": { + "item": "basemetals:coldiron_button" + }, + "group": "basemetals:coldiron_button" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_chestplate.json b/src/generated/resources/data/basemetals/recipes/coldiron_chestplate.json index a1ca7501..b859ac37 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_chestplate.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_chestplate" - }, - "group": "basemetals:coldiron_chestplate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/coldiron" + } + }, + "result": { + "item": "basemetals:coldiron_chestplate" + }, + "group": "basemetals:coldiron_chestplate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_crackhammer.json b/src/generated/resources/data/basemetals/recipes/coldiron_crackhammer.json index 966ff077..a53755d6 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:storage_blocks/coldiron" + } }, - "X": { - "tag": "forge:storage_blocks/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_crackhammer" - }, - "group": "basemetals:coldiron_crackhammer" + "result": { + "item": "basemetals:coldiron_crackhammer" + }, + "group": "basemetals:coldiron_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_crossbow.json b/src/generated/resources/data/basemetals/recipes/coldiron_crossbow.json index 17cd4e33..6d8b0381 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_crossbow.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRR", - " SR", - "R G" - ], - "key": { - "G": { - "tag": "forge:gears/coldiron" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRR", + " SR", + "R G" + ], + "key": { + "G": { + "tag": "forge:gears/coldiron" + }, + "R": { + "tag": "forge:rods/coldiron" + }, + "S": { + "item": "minecraft:string" + } }, - "R": { - "tag": "forge:rods/coldiron" + "result": { + "item": "basemetals:coldiron_crossbow" }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:coldiron_crossbow" - }, - "group": "basemetals:coldiron_crossbow" + "group": "basemetals:coldiron_crossbow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_door.json b/src/generated/resources/data/basemetals/recipes/coldiron_door.json index 83afe115..1c8a6818 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_door.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_door.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_door", - "count": 3 - }, - "group": "basemetals:coldiron_door" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/coldiron" + } + }, + "result": { + "item": "basemetals:coldiron_door", + "count": 3 + }, + "group": "basemetals:coldiron_door" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_fishingrod.json b/src/generated/resources/data/basemetals/recipes/coldiron_fishingrod.json index 3d980edf..240e0e50 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_fishingrod.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " R", - " RS", - "R S" - ], - "key": { - "R": { - "tag": "forge:rods/coldiron" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " R", + " RS", + "R S" + ], + "key": { + "R": { + "tag": "forge:rods/coldiron" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:coldiron_fishing_rod" - }, - "group": "basemetals:coldiron_fishing_rod" + "result": { + "item": "basemetals:coldiron_fishing_rod" + }, + "group": "basemetals:coldiron_fishing_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_gear.json b/src/generated/resources/data/basemetals/recipes/coldiron_gear.json index 539cb9d3..55867f76 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_gear.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_gear.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "XRX", - " X " - ], - "key": { - "R": { - "tag": "forge:rods/coldiron" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XRX", + " X " + ], + "key": { + "R": { + "tag": "forge:rods/coldiron" + }, + "X": { + "tag": "forge:ingots/coldiron" + } }, - "X": { - "tag": "forge:ingots/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_gear", - "count": 4 - }, - "group": "basemetals:coldiron_gear" + "result": { + "item": "basemetals:coldiron_gear", + "count": 4 + }, + "group": "basemetals:coldiron_gear" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_helmet.json b/src/generated/resources/data/basemetals/recipes/coldiron_helmet.json index 50df414c..274c162a 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_helmet.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_helmet" - }, - "group": "basemetals:coldiron_helmet" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/coldiron" + } + }, + "result": { + "item": "basemetals:coldiron_helmet" + }, + "group": "basemetals:coldiron_helmet" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_hoe.json b/src/generated/resources/data/basemetals/recipes/coldiron_hoe.json index cc0504a3..f6f550f3 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_hoe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - " S", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " S", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/coldiron" + } }, - "X": { - "tag": "forge:ingots/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_hoe" - }, - "group": "basemetals:coldiron_hoe" + "result": { + "item": "basemetals:coldiron_hoe" + }, + "group": "basemetals:coldiron_hoe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_horsearmor.json b/src/generated/resources/data/basemetals/recipes/coldiron_horsearmor.json index 1c9b801f..366b2498 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_horsearmor.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "XWX", - "XXX" - ], - "key": { - "W": { - "tag": "minecraft:wool" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "XWX", + "XXX" + ], + "key": { + "W": { + "tag": "minecraft:wool" + }, + "X": { + "tag": "forge:ingots/coldiron" + } }, - "X": { - "tag": "forge:ingots/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_horse_armor" - }, - "group": "basemetals:coldiron_horse_armor" + "result": { + "item": "basemetals:coldiron_horse_armor" + }, + "group": "basemetals:coldiron_horse_armor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/coldiron_ingot_from_nuggets.json index 7a17f51f..39cb46f3 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_ingot_from_nuggets.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:nuggets/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_ingot" - }, - "group": "basemetals:coldiron_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:nuggets/coldiron" + } + }, + "result": { + "item": "basemetals:coldiron_ingot" + }, + "group": "basemetals:coldiron_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_leggings.json b/src/generated/resources/data/basemetals/recipes/coldiron_leggings.json index 6d832308..cf1e2d41 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_leggings.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_leggings" - }, - "group": "basemetals:coldiron_leggings" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/coldiron" + } + }, + "result": { + "item": "basemetals:coldiron_leggings" + }, + "group": "basemetals:coldiron_leggings" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_lever.json b/src/generated/resources/data/basemetals/recipes/coldiron_lever.json index 0ae58d6c..397f960d 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_lever.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_lever.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "X" - ], - "key": { - "R": { - "tag": "forge:rods/coldiron" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "X" + ], + "key": { + "R": { + "tag": "forge:rods/coldiron" + }, + "X": { + "tag": "forge:ingots/coldiron" + } }, - "X": { - "tag": "forge:ingots/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_lever" - }, - "group": "basemetals:coldiron_lever" + "result": { + "item": "basemetals:coldiron_lever" + }, + "group": "basemetals:coldiron_lever" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_nuggets.json b/src/generated/resources/data/basemetals/recipes/coldiron_nuggets.json index f987b87b..08624202 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_nuggets.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:ingots/coldiron" - } - ], - "result": { - "item": "basemetals:coldiron_nugget", - "count": 9 - }, - "group": "basemetals:coldiron_nugget" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/coldiron" + } + ], + "result": { + "item": "basemetals:coldiron_nugget", + "count": 9 + }, + "group": "basemetals:coldiron_nugget" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_pickaxe.json b/src/generated/resources/data/basemetals/recipes/coldiron_pickaxe.json index 344d3714..1fc5f1e7 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_pickaxe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " S ", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " S ", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/coldiron" + } }, - "X": { - "tag": "forge:ingots/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_pickaxe" - }, - "group": "basemetals:coldiron_pickaxe" + "result": { + "item": "basemetals:coldiron_pickaxe" + }, + "group": "basemetals:coldiron_pickaxe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_plate.json b/src/generated/resources/data/basemetals/recipes/coldiron_plate.json index 466f7b63..82182a18 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_plate.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_plate.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_plate", - "count": 3 - }, - "group": "basemetals:coldiron_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/coldiron" + } + }, + "result": { + "item": "basemetals:coldiron_plate", + "count": 3 + }, + "group": "basemetals:coldiron_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/coldiron_powder_from_small.json index 7d49864d..e46057b2 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_powder" - }, - "group": "basemetals:coldiron_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/coldiron" + } + }, + "result": { + "item": "basemetals:coldiron_powder" + }, + "group": "basemetals:coldiron_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/coldiron_pressure_plate.json index e9552ae8..17365fe7 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_pressure_plate.json @@ -1,15 +1,18 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_pressure_plate" - }, - "group": "basemetals:coldiron_pressure_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/coldiron" + } + }, + "result": { + "item": "basemetals:coldiron_pressure_plate" + }, + "group": "basemetals:coldiron_pressure_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_rod.json b/src/generated/resources/data/basemetals/recipes/coldiron_rod.json index 3016335a..764c5075 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_rod.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_rod.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:ingots/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_rod", - "count": 4 - }, - "group": "basemetals:coldiron_rod" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:ingots/coldiron" + } + }, + "result": { + "item": "basemetals:coldiron_rod", + "count": 4 + }, + "group": "basemetals:coldiron_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_scythe.json b/src/generated/resources/data/basemetals/recipes/coldiron_scythe.json index 7dd58408..b7f349c6 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/coldiron" + } }, - "X": { - "tag": "forge:ingots/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_scythe" - }, - "group": "basemetals:coldiron_scythe" + "result": { + "item": "basemetals:coldiron_scythe" + }, + "group": "basemetals:coldiron_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_shears.json b/src/generated/resources/data/basemetals/recipes/coldiron_shears.json index 39260d22..1e198a42 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_shears.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_shears.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "X " - ], - "key": { - "X": { - "tag": "forge:ingots/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_shears" - }, - "group": "basemetals:coldiron_shears" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "X " + ], + "key": { + "X": { + "tag": "forge:ingots/coldiron" + } + }, + "result": { + "item": "basemetals:coldiron_shears" + }, + "group": "basemetals:coldiron_shears" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_shield.json b/src/generated/resources/data/basemetals/recipes/coldiron_shield.json index 4a1c80ef..ffec5c5c 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_shield.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_shield.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XWX", - "XXX", - " X " - ], - "key": { - "W": { - "tag": "minecraft:planks" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XWX", + "XXX", + " X " + ], + "key": { + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:ingots/coldiron" + } }, - "X": { - "tag": "forge:ingots/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_shield" - }, - "group": "basemetals:coldiron_shield" + "result": { + "item": "basemetals:coldiron_shield" + }, + "group": "basemetals:coldiron_shield" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_shovel.json b/src/generated/resources/data/basemetals/recipes/coldiron_shovel.json index 779996a9..79de5e9f 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_shovel.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/coldiron" + } }, - "X": { - "tag": "forge:ingots/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_shovel" - }, - "group": "basemetals:coldiron_shovel" + "result": { + "item": "basemetals:coldiron_shovel" + }, + "group": "basemetals:coldiron_shovel" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_slab.json b/src/generated/resources/data/basemetals/recipes/coldiron_slab.json index f229f5b9..4a77af8c 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_slab.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_slab.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_slab", - "count": 6 - }, - "group": "basemetals:coldiron_slab" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/coldiron" + } + }, + "result": { + "item": "basemetals:coldiron_slab", + "count": 6 + }, + "group": "basemetals:coldiron_slab" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_smallpowder.json b/src/generated/resources/data/basemetals/recipes/coldiron_smallpowder.json index 4587bf85..81650c7e 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/coldiron" - } - ], - "result": { - "item": "basemetals:coldiron_smallpowder", - "count": 9 - }, - "group": "basemetals:coldiron_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/coldiron" + } + ], + "result": { + "item": "basemetals:coldiron_smallpowder", + "count": 9 + }, + "group": "basemetals:coldiron_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_stairs.json b/src/generated/resources/data/basemetals/recipes/coldiron_stairs.json index 6d3c449c..c80d0aaf 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_stairs.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X ", - "XX ", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_stairs", - "count": 4 - }, - "group": "basemetals:coldiron_stairs" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/coldiron" + } + }, + "result": { + "item": "basemetals:coldiron_stairs", + "count": 4 + }, + "group": "basemetals:coldiron_stairs" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_sword.json b/src/generated/resources/data/basemetals/recipes/coldiron_sword.json index 7aa3915d..ada05c91 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_sword.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_sword.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/coldiron" + } }, - "X": { - "tag": "forge:ingots/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_sword" - }, - "group": "basemetals:coldiron_sword" + "result": { + "item": "basemetals:coldiron_sword" + }, + "group": "basemetals:coldiron_sword" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_trapdoor.json b/src/generated/resources/data/basemetals/recipes/coldiron_trapdoor.json index 9e82a445..bd2a488f 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_trapdoor.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_trapdoor" - }, - "group": "basemetals:coldiron_trapdoor" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/coldiron" + } + }, + "result": { + "item": "basemetals:coldiron_trapdoor" + }, + "group": "basemetals:coldiron_trapdoor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/coldiron_wall.json b/src/generated/resources/data/basemetals/recipes/coldiron_wall.json index afc5bdd4..0b351b83 100644 --- a/src/generated/resources/data/basemetals/recipes/coldiron_wall.json +++ b/src/generated/resources/data/basemetals/recipes/coldiron_wall.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/coldiron" - } - }, - "result": { - "item": "basemetals:coldiron_wall", - "count": 6 - }, - "group": "basemetals:coldiron_wall" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/coldiron" + } + }, + "result": { + "item": "basemetals:coldiron_wall", + "count": 6 + }, + "group": "basemetals:coldiron_wall" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_arrow.json b/src/generated/resources/data/basemetals/recipes/copper_arrow.json index f50925e0..93685d91 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/copper_arrow.json @@ -1,24 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "N", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "N", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "N": { + "tag": "forge:nuggets/copper" + }, + "R": { + "tag": "forge:rods/copper" + } }, - "N": { - "tag": "forge:nuggets/copper" + "result": { + "item": "basemetals:copper_arrow", + "count": 4 }, - "R": { - "tag": "forge:rods/copper" - } - }, - "result": { - "item": "basemetals:copper_arrow", - "count": 4 - }, - "group": "basemetals:copper_arrow" + "group": "basemetals:copper_arrow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_axe.json b/src/generated/resources/data/basemetals/recipes/copper_axe.json index 867f6c80..27c7ed4b 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_axe.json +++ b/src/generated/resources/data/basemetals/recipes/copper_axe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XS", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XS", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/copper" + } }, - "X": { - "tag": "forge:ingots/copper" - } - }, - "result": { - "item": "basemetals:copper_axe" - }, - "group": "basemetals:copper_axe" + "result": { + "item": "basemetals:copper_axe" + }, + "group": "basemetals:copper_axe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_bars.json b/src/generated/resources/data/basemetals/recipes/copper_bars.json index df857217..1df49df6 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_bars.json +++ b/src/generated/resources/data/basemetals/recipes/copper_bars.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/copper" - } - }, - "result": { - "item": "basemetals:copper_bars", - "count": 16 - }, - "group": "basemetals:copper_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/copper" + } + }, + "result": { + "item": "basemetals:copper_bars", + "count": 16 + }, + "group": "basemetals:copper_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_bars_2.json b/src/generated/resources/data/basemetals/recipes/copper_bars_2.json index 7d77909c..c4d1e5d0 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/copper_bars_2.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:rods/copper" - } - }, - "result": { - "item": "basemetals:copper_bars", - "count": 4 - }, - "group": "basemetals:copper_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:rods/copper" + } + }, + "result": { + "item": "basemetals:copper_bars", + "count": 4 + }, + "group": "basemetals:copper_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_block.json b/src/generated/resources/data/basemetals/recipes/copper_block.json index 0d35e150..decb4279 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_block.json +++ b/src/generated/resources/data/basemetals/recipes/copper_block.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "item": "basemetals:copper_ingot" - } - }, - "result": { - "item": "basemetals:copper_block" - }, - "group": "basemetals:copper_block" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "item": "basemetals:copper_ingot" + } + }, + "result": { + "item": "basemetals:copper_block" + }, + "group": "basemetals:copper_block" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_block_ingot.json b/src/generated/resources/data/basemetals/recipes/copper_block_ingot.json index 59fd88d7..238a6721 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/copper_block_ingot.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "basemetals:copper_block" - } - ], - "result": { - "item": "basemetals:copper_ingot", - "count": 9 - }, - "group": "basemetals:copper_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "basemetals:copper_block" + } + ], + "result": { + "item": "basemetals:copper_ingot", + "count": 9 + }, + "group": "basemetals:copper_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_bolt.json b/src/generated/resources/data/basemetals/recipes/copper_bolt.json index df88a8b7..823669ed 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/copper_bolt.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "R": { + "tag": "forge:rods/copper" + } }, - "R": { - "tag": "forge:rods/copper" - } - }, - "result": { - "item": "basemetals:copper_bolt", - "count": 4 - }, - "group": "basemetals:copper_bolt" + "result": { + "item": "basemetals:copper_bolt", + "count": 4 + }, + "group": "basemetals:copper_bolt" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_boots.json b/src/generated/resources/data/basemetals/recipes/copper_boots.json index fa7e5384..a13d2466 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_boots.json +++ b/src/generated/resources/data/basemetals/recipes/copper_boots.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/copper" - } - }, - "result": { - "item": "basemetals:copper_boots" - }, - "group": "basemetals:copper_boots" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/copper" + } + }, + "result": { + "item": "basemetals:copper_boots" + }, + "group": "basemetals:copper_boots" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_bow.json b/src/generated/resources/data/basemetals/recipes/copper_bow.json index 2709fb05..d69868b2 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_bow.json +++ b/src/generated/resources/data/basemetals/recipes/copper_bow.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " RS", - "R S", - " RS" - ], - "key": { - "R": { - "tag": "forge:rods/copper" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " RS", + "R S", + " RS" + ], + "key": { + "R": { + "tag": "forge:rods/copper" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:copper_bow" - }, - "group": "basemetals:copper_bow" + "result": { + "item": "basemetals:copper_bow" + }, + "group": "basemetals:copper_bow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_button.json b/src/generated/resources/data/basemetals/recipes/copper_button.json index a0c9e31c..5cfaa45d 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_button.json +++ b/src/generated/resources/data/basemetals/recipes/copper_button.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:nuggets/copper" - } - }, - "result": { - "item": "basemetals:copper_button" - }, - "group": "basemetals:copper_button" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:nuggets/copper" + } + }, + "result": { + "item": "basemetals:copper_button" + }, + "group": "basemetals:copper_button" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_chestplate.json b/src/generated/resources/data/basemetals/recipes/copper_chestplate.json index 1a509058..6abe787b 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/copper_chestplate.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/copper" - } - }, - "result": { - "item": "basemetals:copper_chestplate" - }, - "group": "basemetals:copper_chestplate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/copper" + } + }, + "result": { + "item": "basemetals:copper_chestplate" + }, + "group": "basemetals:copper_chestplate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_crackhammer.json b/src/generated/resources/data/basemetals/recipes/copper_crackhammer.json index 09d3797e..267aac72 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/copper_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:storage_blocks/copper" + } }, - "X": { - "tag": "forge:storage_blocks/copper" - } - }, - "result": { - "item": "basemetals:copper_crackhammer" - }, - "group": "basemetals:copper_crackhammer" + "result": { + "item": "basemetals:copper_crackhammer" + }, + "group": "basemetals:copper_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_crossbow.json b/src/generated/resources/data/basemetals/recipes/copper_crossbow.json index bf0c0370..badd204a 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/copper_crossbow.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRR", - " SR", - "R G" - ], - "key": { - "G": { - "tag": "forge:gears/copper" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRR", + " SR", + "R G" + ], + "key": { + "G": { + "tag": "forge:gears/copper" + }, + "R": { + "tag": "forge:rods/copper" + }, + "S": { + "item": "minecraft:string" + } }, - "R": { - "tag": "forge:rods/copper" + "result": { + "item": "basemetals:copper_crossbow" }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:copper_crossbow" - }, - "group": "basemetals:copper_crossbow" + "group": "basemetals:copper_crossbow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_door.json b/src/generated/resources/data/basemetals/recipes/copper_door.json index f3fc79a2..dfc27186 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_door.json +++ b/src/generated/resources/data/basemetals/recipes/copper_door.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/copper" - } - }, - "result": { - "item": "basemetals:copper_door", - "count": 3 - }, - "group": "basemetals:copper_door" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/copper" + } + }, + "result": { + "item": "basemetals:copper_door", + "count": 3 + }, + "group": "basemetals:copper_door" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_fishingrod.json b/src/generated/resources/data/basemetals/recipes/copper_fishingrod.json index b6df4c65..1cb4a49c 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/copper_fishingrod.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " R", - " RS", - "R S" - ], - "key": { - "R": { - "tag": "forge:rods/copper" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " R", + " RS", + "R S" + ], + "key": { + "R": { + "tag": "forge:rods/copper" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:copper_fishing_rod" - }, - "group": "basemetals:copper_fishing_rod" + "result": { + "item": "basemetals:copper_fishing_rod" + }, + "group": "basemetals:copper_fishing_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_gear.json b/src/generated/resources/data/basemetals/recipes/copper_gear.json index 0947b185..47dca89e 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_gear.json +++ b/src/generated/resources/data/basemetals/recipes/copper_gear.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "XRX", - " X " - ], - "key": { - "R": { - "tag": "forge:rods/copper" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XRX", + " X " + ], + "key": { + "R": { + "tag": "forge:rods/copper" + }, + "X": { + "tag": "forge:ingots/copper" + } }, - "X": { - "tag": "forge:ingots/copper" - } - }, - "result": { - "item": "basemetals:copper_gear", - "count": 4 - }, - "group": "basemetals:copper_gear" + "result": { + "item": "basemetals:copper_gear", + "count": 4 + }, + "group": "basemetals:copper_gear" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_helmet.json b/src/generated/resources/data/basemetals/recipes/copper_helmet.json index 22965336..14b09768 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/copper_helmet.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/copper" - } - }, - "result": { - "item": "basemetals:copper_helmet" - }, - "group": "basemetals:copper_helmet" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/copper" + } + }, + "result": { + "item": "basemetals:copper_helmet" + }, + "group": "basemetals:copper_helmet" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_hoe.json b/src/generated/resources/data/basemetals/recipes/copper_hoe.json index 2a1df74e..1b1dc54d 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/copper_hoe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - " S", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " S", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/copper" + } }, - "X": { - "tag": "forge:ingots/copper" - } - }, - "result": { - "item": "basemetals:copper_hoe" - }, - "group": "basemetals:copper_hoe" + "result": { + "item": "basemetals:copper_hoe" + }, + "group": "basemetals:copper_hoe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_horsearmor.json b/src/generated/resources/data/basemetals/recipes/copper_horsearmor.json index ffed2a75..5e3f8f0a 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/copper_horsearmor.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "XWX", - "XXX" - ], - "key": { - "W": { - "tag": "minecraft:wool" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "XWX", + "XXX" + ], + "key": { + "W": { + "tag": "minecraft:wool" + }, + "X": { + "tag": "forge:ingots/copper" + } }, - "X": { - "tag": "forge:ingots/copper" - } - }, - "result": { - "item": "basemetals:copper_horse_armor" - }, - "group": "basemetals:copper_horse_armor" + "result": { + "item": "basemetals:copper_horse_armor" + }, + "group": "basemetals:copper_horse_armor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/copper_ingot_from_nuggets.json index 9399e6cf..e5940627 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/copper_ingot_from_nuggets.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "item": "basemetals:copper_nugget" - } - }, - "result": { - "item": "basemetals:copper_ingot" - }, - "group": "basemetals:copper_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "item": "basemetals:copper_nugget" + } + }, + "result": { + "item": "basemetals:copper_ingot" + }, + "group": "basemetals:copper_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_leggings.json b/src/generated/resources/data/basemetals/recipes/copper_leggings.json index b5543acf..db6354e8 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/copper_leggings.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/copper" - } - }, - "result": { - "item": "basemetals:copper_leggings" - }, - "group": "basemetals:copper_leggings" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/copper" + } + }, + "result": { + "item": "basemetals:copper_leggings" + }, + "group": "basemetals:copper_leggings" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_lever.json b/src/generated/resources/data/basemetals/recipes/copper_lever.json index 0dda3aad..5c579783 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_lever.json +++ b/src/generated/resources/data/basemetals/recipes/copper_lever.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "X" - ], - "key": { - "R": { - "tag": "forge:rods/copper" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "X" + ], + "key": { + "R": { + "tag": "forge:rods/copper" + }, + "X": { + "tag": "forge:ingots/copper" + } }, - "X": { - "tag": "forge:ingots/copper" - } - }, - "result": { - "item": "basemetals:copper_lever" - }, - "group": "basemetals:copper_lever" + "result": { + "item": "basemetals:copper_lever" + }, + "group": "basemetals:copper_lever" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_nuggets.json b/src/generated/resources/data/basemetals/recipes/copper_nuggets.json index 5cf3048e..15e92bb0 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/copper_nuggets.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "basemetals:copper_ingot" - } - ], - "result": { - "item": "basemetals:copper_nugget", - "count": 9 - }, - "group": "basemetals:copper_nugget" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "basemetals:copper_ingot" + } + ], + "result": { + "item": "basemetals:copper_nugget", + "count": 9 + }, + "group": "basemetals:copper_nugget" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_pickaxe.json b/src/generated/resources/data/basemetals/recipes/copper_pickaxe.json index f1e950c5..9538dc9d 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/copper_pickaxe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " S ", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " S ", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/copper" + } }, - "X": { - "tag": "forge:ingots/copper" - } - }, - "result": { - "item": "basemetals:copper_pickaxe" - }, - "group": "basemetals:copper_pickaxe" + "result": { + "item": "basemetals:copper_pickaxe" + }, + "group": "basemetals:copper_pickaxe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_plate.json b/src/generated/resources/data/basemetals/recipes/copper_plate.json index 62c8d839..b1eabff2 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_plate.json +++ b/src/generated/resources/data/basemetals/recipes/copper_plate.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/copper" - } - }, - "result": { - "item": "basemetals:copper_plate", - "count": 3 - }, - "group": "basemetals:copper_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/copper" + } + }, + "result": { + "item": "basemetals:copper_plate", + "count": 3 + }, + "group": "basemetals:copper_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/copper_powder_from_small.json index 6530a091..e3a3a479 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/copper_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/copper" - } - }, - "result": { - "item": "basemetals:copper_powder" - }, - "group": "basemetals:copper_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/copper" + } + }, + "result": { + "item": "basemetals:copper_powder" + }, + "group": "basemetals:copper_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/copper_pressure_plate.json index eb9d38c6..01331d0d 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/copper_pressure_plate.json @@ -1,15 +1,18 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/copper" - } - }, - "result": { - "item": "basemetals:copper_pressure_plate" - }, - "group": "basemetals:copper_pressure_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/copper" + } + }, + "result": { + "item": "basemetals:copper_pressure_plate" + }, + "group": "basemetals:copper_pressure_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_rod.json b/src/generated/resources/data/basemetals/recipes/copper_rod.json index f9e236d9..e93e33b9 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_rod.json +++ b/src/generated/resources/data/basemetals/recipes/copper_rod.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:ingots/copper" - } - }, - "result": { - "item": "basemetals:copper_rod", - "count": 4 - }, - "group": "basemetals:copper_rod" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:ingots/copper" + } + }, + "result": { + "item": "basemetals:copper_rod", + "count": 4 + }, + "group": "basemetals:copper_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_scythe.json b/src/generated/resources/data/basemetals/recipes/copper_scythe.json index 662d89be..65b869d9 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/copper_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/copper" + } }, - "X": { - "tag": "forge:ingots/copper" - } - }, - "result": { - "item": "basemetals:copper_scythe" - }, - "group": "basemetals:copper_scythe" + "result": { + "item": "basemetals:copper_scythe" + }, + "group": "basemetals:copper_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_shears.json b/src/generated/resources/data/basemetals/recipes/copper_shears.json index de28a765..8cd5da5f 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_shears.json +++ b/src/generated/resources/data/basemetals/recipes/copper_shears.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "X " - ], - "key": { - "X": { - "tag": "forge:ingots/copper" - } - }, - "result": { - "item": "basemetals:copper_shears" - }, - "group": "basemetals:copper_shears" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "X " + ], + "key": { + "X": { + "tag": "forge:ingots/copper" + } + }, + "result": { + "item": "basemetals:copper_shears" + }, + "group": "basemetals:copper_shears" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_shield.json b/src/generated/resources/data/basemetals/recipes/copper_shield.json index cc6632a1..c9d4281b 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_shield.json +++ b/src/generated/resources/data/basemetals/recipes/copper_shield.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XWX", - "XXX", - " X " - ], - "key": { - "W": { - "tag": "minecraft:planks" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XWX", + "XXX", + " X " + ], + "key": { + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:ingots/copper" + } }, - "X": { - "tag": "forge:ingots/copper" - } - }, - "result": { - "item": "basemetals:copper_shield" - }, - "group": "basemetals:copper_shield" + "result": { + "item": "basemetals:copper_shield" + }, + "group": "basemetals:copper_shield" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_shovel.json b/src/generated/resources/data/basemetals/recipes/copper_shovel.json index 74e70886..e32b9309 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/copper_shovel.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/copper" + } }, - "X": { - "tag": "forge:ingots/copper" - } - }, - "result": { - "item": "basemetals:copper_shovel" - }, - "group": "basemetals:copper_shovel" + "result": { + "item": "basemetals:copper_shovel" + }, + "group": "basemetals:copper_shovel" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_slab.json b/src/generated/resources/data/basemetals/recipes/copper_slab.json index 43d95c7a..e72bb745 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_slab.json +++ b/src/generated/resources/data/basemetals/recipes/copper_slab.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/copper" - } - }, - "result": { - "item": "basemetals:copper_slab", - "count": 6 - }, - "group": "basemetals:copper_slab" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/copper" + } + }, + "result": { + "item": "basemetals:copper_slab", + "count": 6 + }, + "group": "basemetals:copper_slab" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_smallpowder.json b/src/generated/resources/data/basemetals/recipes/copper_smallpowder.json index 2923bcda..fee68150 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/copper_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/copper" - } - ], - "result": { - "item": "basemetals:copper_smallpowder", - "count": 9 - }, - "group": "basemetals:copper_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/copper" + } + ], + "result": { + "item": "basemetals:copper_smallpowder", + "count": 9 + }, + "group": "basemetals:copper_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_stairs.json b/src/generated/resources/data/basemetals/recipes/copper_stairs.json index 5d2ea3d4..c60c0828 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/copper_stairs.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X ", - "XX ", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/copper" - } - }, - "result": { - "item": "basemetals:copper_stairs", - "count": 4 - }, - "group": "basemetals:copper_stairs" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/copper" + } + }, + "result": { + "item": "basemetals:copper_stairs", + "count": 4 + }, + "group": "basemetals:copper_stairs" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_sword.json b/src/generated/resources/data/basemetals/recipes/copper_sword.json index e609e0e3..36df0037 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_sword.json +++ b/src/generated/resources/data/basemetals/recipes/copper_sword.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/copper" + } }, - "X": { - "tag": "forge:ingots/copper" - } - }, - "result": { - "item": "basemetals:copper_sword" - }, - "group": "basemetals:copper_sword" + "result": { + "item": "basemetals:copper_sword" + }, + "group": "basemetals:copper_sword" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_trapdoor.json b/src/generated/resources/data/basemetals/recipes/copper_trapdoor.json index 1248d719..7b50e6b2 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/copper_trapdoor.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/copper" - } - }, - "result": { - "item": "basemetals:copper_trapdoor" - }, - "group": "basemetals:copper_trapdoor" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/copper" + } + }, + "result": { + "item": "basemetals:copper_trapdoor" + }, + "group": "basemetals:copper_trapdoor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/copper_wall.json b/src/generated/resources/data/basemetals/recipes/copper_wall.json index 34b839e4..34e2465a 100644 --- a/src/generated/resources/data/basemetals/recipes/copper_wall.json +++ b/src/generated/resources/data/basemetals/recipes/copper_wall.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/copper" - } - }, - "result": { - "item": "basemetals:copper_wall", - "count": 6 - }, - "group": "basemetals:copper_wall" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/copper" + } + }, + "result": { + "item": "basemetals:copper_wall", + "count": 6 + }, + "group": "basemetals:copper_wall" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_arrow.json b/src/generated/resources/data/basemetals/recipes/cupronickel_arrow.json index c73939bf..4dfb9afe 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_arrow.json @@ -1,24 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "N", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "N", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "N": { + "tag": "forge:nuggets/cupronickel" + }, + "R": { + "tag": "forge:rods/cupronickel" + } }, - "N": { - "tag": "forge:nuggets/cupronickel" + "result": { + "item": "basemetals:cupronickel_arrow", + "count": 4 }, - "R": { - "tag": "forge:rods/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_arrow", - "count": 4 - }, - "group": "basemetals:cupronickel_arrow" + "group": "basemetals:cupronickel_arrow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_axe.json b/src/generated/resources/data/basemetals/recipes/cupronickel_axe.json index e747c6a4..358bc770 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_axe.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_axe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XS", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XS", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/cupronickel" + } }, - "X": { - "tag": "forge:ingots/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_axe" - }, - "group": "basemetals:cupronickel_axe" + "result": { + "item": "basemetals:cupronickel_axe" + }, + "group": "basemetals:cupronickel_axe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_bars.json b/src/generated/resources/data/basemetals/recipes/cupronickel_bars.json index 15bfa631..5c38ebf7 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_bars.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_bars.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_bars", - "count": 16 - }, - "group": "basemetals:cupronickel_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/cupronickel" + } + }, + "result": { + "item": "basemetals:cupronickel_bars", + "count": 16 + }, + "group": "basemetals:cupronickel_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_bars_2.json b/src/generated/resources/data/basemetals/recipes/cupronickel_bars_2.json index fcf682fb..b4d84adb 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_bars_2.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:rods/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_bars", - "count": 4 - }, - "group": "basemetals:cupronickel_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:rods/cupronickel" + } + }, + "result": { + "item": "basemetals:cupronickel_bars", + "count": 4 + }, + "group": "basemetals:cupronickel_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_blend.json b/src/generated/resources/data/basemetals/recipes/cupronickel_blend.json index 6d0ca279..19dcfc39 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_blend.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_blend.json @@ -1,22 +1,25 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/copper" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/copper" + }, + { + "tag": "forge:dusts/copper" + }, + { + "tag": "forge:dusts/copper" + }, + { + "tag": "forge:dusts/nickel" + } + ], + "result": { + "item": "basemetals:cupronickel_blend", + "count": 4 }, - { - "tag": "forge:dusts/copper" - }, - { - "tag": "forge:dusts/copper" - }, - { - "tag": "forge:dusts/nickel" - } - ], - "result": { - "item": "basemetals:cupronickel_blend", - "count": 4 - }, - "group": "basemetals:cupronickel_blend" + "group": "basemetals:cupronickel_blend" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_blend_from_small.json b/src/generated/resources/data/basemetals/recipes/cupronickel_blend_from_small.json index 750caf9d..3435543b 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_blend_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_blend_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:small_blends/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_blend" - }, - "group": "basemetals:cupronickel_blend" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:small_blends/cupronickel" + } + }, + "result": { + "item": "basemetals:cupronickel_blend" + }, + "group": "basemetals:cupronickel_blend" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_block.json b/src/generated/resources/data/basemetals/recipes/cupronickel_block.json index 547c35df..2315e241 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_block.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_block.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_block" - }, - "group": "basemetals:cupronickel_block" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/cupronickel" + } + }, + "result": { + "item": "basemetals:cupronickel_block" + }, + "group": "basemetals:cupronickel_block" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_block_ingot.json b/src/generated/resources/data/basemetals/recipes/cupronickel_block_ingot.json index 9f3fee80..6979c86a 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_block_ingot.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/cupronickel" - } - ], - "result": { - "item": "basemetals:cupronickel_ingot", - "count": 9 - }, - "group": "basemetals:cupronickel_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/cupronickel" + } + ], + "result": { + "item": "basemetals:cupronickel_ingot", + "count": 9 + }, + "group": "basemetals:cupronickel_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_bolt.json b/src/generated/resources/data/basemetals/recipes/cupronickel_bolt.json index 886ac9e4..69c451a8 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_bolt.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "R": { + "tag": "forge:rods/cupronickel" + } }, - "R": { - "tag": "forge:rods/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_bolt", - "count": 4 - }, - "group": "basemetals:cupronickel_bolt" + "result": { + "item": "basemetals:cupronickel_bolt", + "count": 4 + }, + "group": "basemetals:cupronickel_bolt" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_boots.json b/src/generated/resources/data/basemetals/recipes/cupronickel_boots.json index ca4d7437..1e6c9e63 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_boots.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_boots.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_boots" - }, - "group": "basemetals:cupronickel_boots" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/cupronickel" + } + }, + "result": { + "item": "basemetals:cupronickel_boots" + }, + "group": "basemetals:cupronickel_boots" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_bow.json b/src/generated/resources/data/basemetals/recipes/cupronickel_bow.json index 494485d2..05b79ced 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_bow.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_bow.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " RS", - "R S", - " RS" - ], - "key": { - "R": { - "tag": "forge:rods/cupronickel" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " RS", + "R S", + " RS" + ], + "key": { + "R": { + "tag": "forge:rods/cupronickel" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:cupronickel_bow" - }, - "group": "basemetals:cupronickel_bow" + "result": { + "item": "basemetals:cupronickel_bow" + }, + "group": "basemetals:cupronickel_bow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_button.json b/src/generated/resources/data/basemetals/recipes/cupronickel_button.json index 881cbe07..b8d12209 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_button.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_button.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:nuggets/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_button" - }, - "group": "basemetals:cupronickel_button" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:nuggets/cupronickel" + } + }, + "result": { + "item": "basemetals:cupronickel_button" + }, + "group": "basemetals:cupronickel_button" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_chestplate.json b/src/generated/resources/data/basemetals/recipes/cupronickel_chestplate.json index a1958968..37f512ef 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_chestplate.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_chestplate" - }, - "group": "basemetals:cupronickel_chestplate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/cupronickel" + } + }, + "result": { + "item": "basemetals:cupronickel_chestplate" + }, + "group": "basemetals:cupronickel_chestplate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_crackhammer.json b/src/generated/resources/data/basemetals/recipes/cupronickel_crackhammer.json index f172fe6a..5db61e4f 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:storage_blocks/cupronickel" + } }, - "X": { - "tag": "forge:storage_blocks/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_crackhammer" - }, - "group": "basemetals:cupronickel_crackhammer" + "result": { + "item": "basemetals:cupronickel_crackhammer" + }, + "group": "basemetals:cupronickel_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_crossbow.json b/src/generated/resources/data/basemetals/recipes/cupronickel_crossbow.json index a57736ad..946e8abe 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_crossbow.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRR", - " SR", - "R G" - ], - "key": { - "G": { - "tag": "forge:gears/cupronickel" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRR", + " SR", + "R G" + ], + "key": { + "G": { + "tag": "forge:gears/cupronickel" + }, + "R": { + "tag": "forge:rods/cupronickel" + }, + "S": { + "item": "minecraft:string" + } }, - "R": { - "tag": "forge:rods/cupronickel" + "result": { + "item": "basemetals:cupronickel_crossbow" }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:cupronickel_crossbow" - }, - "group": "basemetals:cupronickel_crossbow" + "group": "basemetals:cupronickel_crossbow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_door.json b/src/generated/resources/data/basemetals/recipes/cupronickel_door.json index c54ac9ff..48ada456 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_door.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_door.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_door", - "count": 3 - }, - "group": "basemetals:cupronickel_door" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/cupronickel" + } + }, + "result": { + "item": "basemetals:cupronickel_door", + "count": 3 + }, + "group": "basemetals:cupronickel_door" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_fishingrod.json b/src/generated/resources/data/basemetals/recipes/cupronickel_fishingrod.json index e87d6380..20d86168 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_fishingrod.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " R", - " RS", - "R S" - ], - "key": { - "R": { - "tag": "forge:rods/cupronickel" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " R", + " RS", + "R S" + ], + "key": { + "R": { + "tag": "forge:rods/cupronickel" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:cupronickel_fishing_rod" - }, - "group": "basemetals:cupronickel_fishing_rod" + "result": { + "item": "basemetals:cupronickel_fishing_rod" + }, + "group": "basemetals:cupronickel_fishing_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_gear.json b/src/generated/resources/data/basemetals/recipes/cupronickel_gear.json index 85e3d7e3..9ca3e952 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_gear.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_gear.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "XRX", - " X " - ], - "key": { - "R": { - "tag": "forge:rods/cupronickel" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XRX", + " X " + ], + "key": { + "R": { + "tag": "forge:rods/cupronickel" + }, + "X": { + "tag": "forge:ingots/cupronickel" + } }, - "X": { - "tag": "forge:ingots/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_gear", - "count": 4 - }, - "group": "basemetals:cupronickel_gear" + "result": { + "item": "basemetals:cupronickel_gear", + "count": 4 + }, + "group": "basemetals:cupronickel_gear" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_helmet.json b/src/generated/resources/data/basemetals/recipes/cupronickel_helmet.json index 6126cc7e..197efe02 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_helmet.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_helmet" - }, - "group": "basemetals:cupronickel_helmet" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/cupronickel" + } + }, + "result": { + "item": "basemetals:cupronickel_helmet" + }, + "group": "basemetals:cupronickel_helmet" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_hoe.json b/src/generated/resources/data/basemetals/recipes/cupronickel_hoe.json index 1b2b8e5c..12f98568 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_hoe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - " S", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " S", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/cupronickel" + } }, - "X": { - "tag": "forge:ingots/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_hoe" - }, - "group": "basemetals:cupronickel_hoe" + "result": { + "item": "basemetals:cupronickel_hoe" + }, + "group": "basemetals:cupronickel_hoe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_horsearmor.json b/src/generated/resources/data/basemetals/recipes/cupronickel_horsearmor.json index 2c369e19..7ff1fbf0 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_horsearmor.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "XWX", - "XXX" - ], - "key": { - "W": { - "tag": "minecraft:wool" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "XWX", + "XXX" + ], + "key": { + "W": { + "tag": "minecraft:wool" + }, + "X": { + "tag": "forge:ingots/cupronickel" + } }, - "X": { - "tag": "forge:ingots/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_horse_armor" - }, - "group": "basemetals:cupronickel_horse_armor" + "result": { + "item": "basemetals:cupronickel_horse_armor" + }, + "group": "basemetals:cupronickel_horse_armor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/cupronickel_ingot_from_nuggets.json index ee9a3931..b261d54c 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_ingot_from_nuggets.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:nuggets/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_ingot" - }, - "group": "basemetals:cupronickel_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:nuggets/cupronickel" + } + }, + "result": { + "item": "basemetals:cupronickel_ingot" + }, + "group": "basemetals:cupronickel_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_leggings.json b/src/generated/resources/data/basemetals/recipes/cupronickel_leggings.json index 214c338f..f592ff3d 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_leggings.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_leggings" - }, - "group": "basemetals:cupronickel_leggings" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/cupronickel" + } + }, + "result": { + "item": "basemetals:cupronickel_leggings" + }, + "group": "basemetals:cupronickel_leggings" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_lever.json b/src/generated/resources/data/basemetals/recipes/cupronickel_lever.json index ec1d61dc..f01ac544 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_lever.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_lever.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "X" - ], - "key": { - "R": { - "tag": "forge:rods/cupronickel" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "X" + ], + "key": { + "R": { + "tag": "forge:rods/cupronickel" + }, + "X": { + "tag": "forge:ingots/cupronickel" + } }, - "X": { - "tag": "forge:ingots/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_lever" - }, - "group": "basemetals:cupronickel_lever" + "result": { + "item": "basemetals:cupronickel_lever" + }, + "group": "basemetals:cupronickel_lever" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_nuggets.json b/src/generated/resources/data/basemetals/recipes/cupronickel_nuggets.json index eba8f90d..d26cb17f 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_nuggets.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:ingots/cupronickel" - } - ], - "result": { - "item": "basemetals:cupronickel_nugget", - "count": 9 - }, - "group": "basemetals:cupronickel_nugget" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/cupronickel" + } + ], + "result": { + "item": "basemetals:cupronickel_nugget", + "count": 9 + }, + "group": "basemetals:cupronickel_nugget" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_pickaxe.json b/src/generated/resources/data/basemetals/recipes/cupronickel_pickaxe.json index c6aaaa4e..1f534e29 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_pickaxe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " S ", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " S ", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/cupronickel" + } }, - "X": { - "tag": "forge:ingots/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_pickaxe" - }, - "group": "basemetals:cupronickel_pickaxe" + "result": { + "item": "basemetals:cupronickel_pickaxe" + }, + "group": "basemetals:cupronickel_pickaxe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_plate.json b/src/generated/resources/data/basemetals/recipes/cupronickel_plate.json index 7aa12e08..f600c9e7 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_plate.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_plate.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_plate", - "count": 3 - }, - "group": "basemetals:cupronickel_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/cupronickel" + } + }, + "result": { + "item": "basemetals:cupronickel_plate", + "count": 3 + }, + "group": "basemetals:cupronickel_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/cupronickel_powder_from_small.json index 5a439769..3b050e1a 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_powder" - }, - "group": "basemetals:cupronickel_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/cupronickel" + } + }, + "result": { + "item": "basemetals:cupronickel_powder" + }, + "group": "basemetals:cupronickel_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/cupronickel_pressure_plate.json index 35c818df..2d62ff08 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_pressure_plate.json @@ -1,15 +1,18 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_pressure_plate" - }, - "group": "basemetals:cupronickel_pressure_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/cupronickel" + } + }, + "result": { + "item": "basemetals:cupronickel_pressure_plate" + }, + "group": "basemetals:cupronickel_pressure_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_rod.json b/src/generated/resources/data/basemetals/recipes/cupronickel_rod.json index 691b22c3..cb8d7d2f 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_rod.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_rod.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:ingots/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_rod", - "count": 4 - }, - "group": "basemetals:cupronickel_rod" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:ingots/cupronickel" + } + }, + "result": { + "item": "basemetals:cupronickel_rod", + "count": 4 + }, + "group": "basemetals:cupronickel_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_scythe.json b/src/generated/resources/data/basemetals/recipes/cupronickel_scythe.json index 7b1c2868..7c5d21de 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/cupronickel" + } }, - "X": { - "tag": "forge:ingots/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_scythe" - }, - "group": "basemetals:cupronickel_scythe" + "result": { + "item": "basemetals:cupronickel_scythe" + }, + "group": "basemetals:cupronickel_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_shears.json b/src/generated/resources/data/basemetals/recipes/cupronickel_shears.json index 3ff89e8a..a55a9edf 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_shears.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_shears.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "X " - ], - "key": { - "X": { - "tag": "forge:ingots/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_shears" - }, - "group": "basemetals:cupronickel_shears" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "X " + ], + "key": { + "X": { + "tag": "forge:ingots/cupronickel" + } + }, + "result": { + "item": "basemetals:cupronickel_shears" + }, + "group": "basemetals:cupronickel_shears" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_shield.json b/src/generated/resources/data/basemetals/recipes/cupronickel_shield.json index e5470177..2e452ca5 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_shield.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_shield.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XWX", - "XXX", - " X " - ], - "key": { - "W": { - "tag": "minecraft:planks" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XWX", + "XXX", + " X " + ], + "key": { + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:ingots/cupronickel" + } }, - "X": { - "tag": "forge:ingots/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_shield" - }, - "group": "basemetals:cupronickel_shield" + "result": { + "item": "basemetals:cupronickel_shield" + }, + "group": "basemetals:cupronickel_shield" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_shovel.json b/src/generated/resources/data/basemetals/recipes/cupronickel_shovel.json index a1d13ad2..01a93d92 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_shovel.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/cupronickel" + } }, - "X": { - "tag": "forge:ingots/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_shovel" - }, - "group": "basemetals:cupronickel_shovel" + "result": { + "item": "basemetals:cupronickel_shovel" + }, + "group": "basemetals:cupronickel_shovel" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_slab.json b/src/generated/resources/data/basemetals/recipes/cupronickel_slab.json index a216d59e..8e92a73d 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_slab.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_slab.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_slab", - "count": 6 - }, - "group": "basemetals:cupronickel_slab" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/cupronickel" + } + }, + "result": { + "item": "basemetals:cupronickel_slab", + "count": 6 + }, + "group": "basemetals:cupronickel_slab" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_smallblend.json b/src/generated/resources/data/basemetals/recipes/cupronickel_smallblend.json index f594e8b7..de10972c 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_smallblend.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_smallblend.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:blends/cupronickel" - } - ], - "result": { - "item": "basemetals:cupronickel_smallblend", - "count": 9 - }, - "group": "basemetals:cupronickel_smallblend" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:blends/cupronickel" + } + ], + "result": { + "item": "basemetals:cupronickel_smallblend", + "count": 9 + }, + "group": "basemetals:cupronickel_smallblend" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_smallpowder.json b/src/generated/resources/data/basemetals/recipes/cupronickel_smallpowder.json index 3c92e335..461f5857 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/cupronickel" - } - ], - "result": { - "item": "basemetals:cupronickel_smallpowder", - "count": 9 - }, - "group": "basemetals:cupronickel_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/cupronickel" + } + ], + "result": { + "item": "basemetals:cupronickel_smallpowder", + "count": 9 + }, + "group": "basemetals:cupronickel_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_stairs.json b/src/generated/resources/data/basemetals/recipes/cupronickel_stairs.json index dae653b9..98ecd4f5 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_stairs.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X ", - "XX ", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_stairs", - "count": 4 - }, - "group": "basemetals:cupronickel_stairs" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/cupronickel" + } + }, + "result": { + "item": "basemetals:cupronickel_stairs", + "count": 4 + }, + "group": "basemetals:cupronickel_stairs" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_sword.json b/src/generated/resources/data/basemetals/recipes/cupronickel_sword.json index 5cec1ad3..970de79f 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_sword.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_sword.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/cupronickel" + } }, - "X": { - "tag": "forge:ingots/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_sword" - }, - "group": "basemetals:cupronickel_sword" + "result": { + "item": "basemetals:cupronickel_sword" + }, + "group": "basemetals:cupronickel_sword" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_trapdoor.json b/src/generated/resources/data/basemetals/recipes/cupronickel_trapdoor.json index 49d3994d..3d3000f7 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_trapdoor.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_trapdoor" - }, - "group": "basemetals:cupronickel_trapdoor" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/cupronickel" + } + }, + "result": { + "item": "basemetals:cupronickel_trapdoor" + }, + "group": "basemetals:cupronickel_trapdoor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/cupronickel_wall.json b/src/generated/resources/data/basemetals/recipes/cupronickel_wall.json index 0f1ac03f..31343288 100644 --- a/src/generated/resources/data/basemetals/recipes/cupronickel_wall.json +++ b/src/generated/resources/data/basemetals/recipes/cupronickel_wall.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/cupronickel" - } - }, - "result": { - "item": "basemetals:cupronickel_wall", - "count": 6 - }, - "group": "basemetals:cupronickel_wall" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/cupronickel" + } + }, + "result": { + "item": "basemetals:cupronickel_wall", + "count": 6 + }, + "group": "basemetals:cupronickel_wall" + } } diff --git a/src/generated/resources/data/basemetals/recipes/detector_rail.json b/src/generated/resources/data/basemetals/recipes/detector_rail.json index eb1dc5ee..2f84d512 100644 --- a/src/generated/resources/data/basemetals/recipes/detector_rail.json +++ b/src/generated/resources/data/basemetals/recipes/detector_rail.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XSX", - "XRX" - ], - "key": { - "R": { - "item": "minecraft:redstone_torch" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XSX", + "XRX" + ], + "key": { + "R": { + "item": "minecraft:redstone_torch" + }, + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/steel" + } }, - "S": { - "tag": "forge:rods/wooden" + "result": { + "item": "minecraft:detector_rail" }, - "X": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "minecraft:detector_rail" - }, - "group": "minecraft:detector_rail" + "group": "minecraft:detector_rail" + } } diff --git a/src/generated/resources/data/basemetals/recipes/diamond_arrow.json b/src/generated/resources/data/basemetals/recipes/diamond_arrow.json index d4defaf5..0bff60bf 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_arrow.json @@ -1,24 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "N", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "N", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "N": { + "tag": "forge:nuggets/diamond" + }, + "R": { + "tag": "forge:rods/diamond" + } }, - "N": { - "tag": "forge:nuggets/diamond" + "result": { + "item": "basemetals:diamond_arrow", + "count": 4 }, - "R": { - "tag": "forge:rods/diamond" - } - }, - "result": { - "item": "basemetals:diamond_arrow", - "count": 4 - }, - "group": "basemetals:diamond_arrow" + "group": "basemetals:diamond_arrow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/diamond_bars.json b/src/generated/resources/data/basemetals/recipes/diamond_bars.json index 3adc5787..2df3a190 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_bars.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_bars.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:gems/diamond" - } - }, - "result": { - "item": "basemetals:diamond_bars", - "count": 16 - }, - "group": "basemetals:diamond_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:gems/diamond" + } + }, + "result": { + "item": "basemetals:diamond_bars", + "count": 16 + }, + "group": "basemetals:diamond_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/diamond_bars_2.json b/src/generated/resources/data/basemetals/recipes/diamond_bars_2.json index bb5242e5..37b6510d 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_bars_2.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:rods/diamond" - } - }, - "result": { - "item": "basemetals:diamond_bars", - "count": 4 - }, - "group": "basemetals:diamond_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:rods/diamond" + } + }, + "result": { + "item": "basemetals:diamond_bars", + "count": 4 + }, + "group": "basemetals:diamond_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/diamond_bolt.json b/src/generated/resources/data/basemetals/recipes/diamond_bolt.json index 336562b3..4570055c 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_bolt.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "R": { + "tag": "forge:rods/diamond" + } }, - "R": { - "tag": "forge:rods/diamond" - } - }, - "result": { - "item": "basemetals:diamond_bolt", - "count": 4 - }, - "group": "basemetals:diamond_bolt" + "result": { + "item": "basemetals:diamond_bolt", + "count": 4 + }, + "group": "basemetals:diamond_bolt" + } } diff --git a/src/generated/resources/data/basemetals/recipes/diamond_bow.json b/src/generated/resources/data/basemetals/recipes/diamond_bow.json index 02c735a0..fcd0e18e 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_bow.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_bow.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " RS", - "R S", - " RS" - ], - "key": { - "R": { - "tag": "forge:rods/diamond" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " RS", + "R S", + " RS" + ], + "key": { + "R": { + "tag": "forge:rods/diamond" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:diamond_bow" - }, - "group": "basemetals:diamond_bow" + "result": { + "item": "basemetals:diamond_bow" + }, + "group": "basemetals:diamond_bow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/diamond_button.json b/src/generated/resources/data/basemetals/recipes/diamond_button.json index ca20ecd5..2451c357 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_button.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_button.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:nuggets/diamond" - } - }, - "result": { - "item": "basemetals:diamond_button" - }, - "group": "basemetals:diamond_button" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:nuggets/diamond" + } + }, + "result": { + "item": "basemetals:diamond_button" + }, + "group": "basemetals:diamond_button" + } } diff --git a/src/generated/resources/data/basemetals/recipes/diamond_crackhammer.json b/src/generated/resources/data/basemetals/recipes/diamond_crackhammer.json index a30647f4..3bf9fc81 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:storage_blocks/diamond" + } }, - "X": { - "tag": "forge:storage_blocks/diamond" - } - }, - "result": { - "item": "basemetals:diamond_crackhammer" - }, - "group": "basemetals:diamond_crackhammer" + "result": { + "item": "basemetals:diamond_crackhammer" + }, + "group": "basemetals:diamond_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/diamond_crossbow.json b/src/generated/resources/data/basemetals/recipes/diamond_crossbow.json index 4f64d4d0..0e911cc3 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_crossbow.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRR", - " SR", - "R G" - ], - "key": { - "G": { - "tag": "forge:gears/diamond" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRR", + " SR", + "R G" + ], + "key": { + "G": { + "tag": "forge:gears/diamond" + }, + "R": { + "tag": "forge:rods/diamond" + }, + "S": { + "item": "minecraft:string" + } }, - "R": { - "tag": "forge:rods/diamond" + "result": { + "item": "basemetals:diamond_crossbow" }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:diamond_crossbow" - }, - "group": "basemetals:diamond_crossbow" + "group": "basemetals:diamond_crossbow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/diamond_door.json b/src/generated/resources/data/basemetals/recipes/diamond_door.json index c7464764..fd9d84ad 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_door.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_door.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:gems/diamond" - } - }, - "result": { - "item": "basemetals:diamond_door", - "count": 3 - }, - "group": "basemetals:diamond_door" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:gems/diamond" + } + }, + "result": { + "item": "basemetals:diamond_door", + "count": 3 + }, + "group": "basemetals:diamond_door" + } } diff --git a/src/generated/resources/data/basemetals/recipes/diamond_fishingrod.json b/src/generated/resources/data/basemetals/recipes/diamond_fishingrod.json index 2222d428..790dfe37 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_fishingrod.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " R", - " RS", - "R S" - ], - "key": { - "R": { - "tag": "forge:rods/diamond" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " R", + " RS", + "R S" + ], + "key": { + "R": { + "tag": "forge:rods/diamond" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:diamond_fishing_rod" - }, - "group": "basemetals:diamond_fishing_rod" + "result": { + "item": "basemetals:diamond_fishing_rod" + }, + "group": "basemetals:diamond_fishing_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/diamond_gear.json b/src/generated/resources/data/basemetals/recipes/diamond_gear.json index 51b133ad..ec43625a 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_gear.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_gear.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "XRX", - " X " - ], - "key": { - "R": { - "tag": "forge:rods/diamond" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XRX", + " X " + ], + "key": { + "R": { + "tag": "forge:rods/diamond" + }, + "X": { + "tag": "forge:gems/diamond" + } }, - "X": { - "tag": "forge:gems/diamond" - } - }, - "result": { - "item": "basemetals:diamond_gear", - "count": 4 - }, - "group": "basemetals:diamond_gear" + "result": { + "item": "basemetals:diamond_gear", + "count": 4 + }, + "group": "basemetals:diamond_gear" + } } diff --git a/src/generated/resources/data/basemetals/recipes/diamond_lever.json b/src/generated/resources/data/basemetals/recipes/diamond_lever.json index 8980c848..00c25b17 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_lever.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_lever.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "X" - ], - "key": { - "R": { - "tag": "forge:rods/diamond" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "X" + ], + "key": { + "R": { + "tag": "forge:rods/diamond" + }, + "X": { + "tag": "forge:gems/diamond" + } }, - "X": { - "tag": "forge:gems/diamond" - } - }, - "result": { - "item": "basemetals:diamond_lever" - }, - "group": "basemetals:diamond_lever" + "result": { + "item": "basemetals:diamond_lever" + }, + "group": "basemetals:diamond_lever" + } } diff --git a/src/generated/resources/data/basemetals/recipes/diamond_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/diamond_powder_from_small.json index 07c1dedc..c35a2e7c 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/diamond" - } - }, - "result": { - "item": "basemetals:diamond_powder" - }, - "group": "basemetals:diamond_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/diamond" + } + }, + "result": { + "item": "basemetals:diamond_powder" + }, + "group": "basemetals:diamond_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/diamond_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/diamond_pressure_plate.json index 4af47934..a7096c1e 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_pressure_plate.json @@ -1,15 +1,18 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX" - ], - "key": { - "X": { - "tag": "forge:gems/diamond" - } - }, - "result": { - "item": "basemetals:diamond_pressure_plate" - }, - "group": "basemetals:diamond_pressure_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX" + ], + "key": { + "X": { + "tag": "forge:gems/diamond" + } + }, + "result": { + "item": "basemetals:diamond_pressure_plate" + }, + "group": "basemetals:diamond_pressure_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/diamond_rod.json b/src/generated/resources/data/basemetals/recipes/diamond_rod.json index 5366523f..20a90969 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_rod.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_rod.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:gems/diamond" - } - }, - "result": { - "item": "basemetals:diamond_rod", - "count": 4 - }, - "group": "basemetals:diamond_rod" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:gems/diamond" + } + }, + "result": { + "item": "basemetals:diamond_rod", + "count": 4 + }, + "group": "basemetals:diamond_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/diamond_scythe.json b/src/generated/resources/data/basemetals/recipes/diamond_scythe.json index 79f6059f..0261a9ff 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:gems/diamond" + } }, - "X": { - "tag": "forge:gems/diamond" - } - }, - "result": { - "item": "basemetals:diamond_scythe" - }, - "group": "basemetals:diamond_scythe" + "result": { + "item": "basemetals:diamond_scythe" + }, + "group": "basemetals:diamond_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/diamond_shears.json b/src/generated/resources/data/basemetals/recipes/diamond_shears.json index b7206161..38d3c642 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_shears.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_shears.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "X " - ], - "key": { - "X": { - "tag": "forge:gems/diamond" - } - }, - "result": { - "item": "basemetals:diamond_shears" - }, - "group": "basemetals:diamond_shears" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "X " + ], + "key": { + "X": { + "tag": "forge:gems/diamond" + } + }, + "result": { + "item": "basemetals:diamond_shears" + }, + "group": "basemetals:diamond_shears" + } } diff --git a/src/generated/resources/data/basemetals/recipes/diamond_shield.json b/src/generated/resources/data/basemetals/recipes/diamond_shield.json index a5264b93..734f7162 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_shield.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_shield.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XWX", - "XXX", - " X " - ], - "key": { - "W": { - "tag": "minecraft:planks" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XWX", + "XXX", + " X " + ], + "key": { + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:gems/diamond" + } }, - "X": { - "tag": "forge:gems/diamond" - } - }, - "result": { - "item": "basemetals:diamond_shield" - }, - "group": "basemetals:diamond_shield" + "result": { + "item": "basemetals:diamond_shield" + }, + "group": "basemetals:diamond_shield" + } } diff --git a/src/generated/resources/data/basemetals/recipes/diamond_slab.json b/src/generated/resources/data/basemetals/recipes/diamond_slab.json index 03181042..2a34c6e7 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_slab.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_slab.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/diamond" - } - }, - "result": { - "item": "basemetals:diamond_slab", - "count": 6 - }, - "group": "basemetals:diamond_slab" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/diamond" + } + }, + "result": { + "item": "basemetals:diamond_slab", + "count": 6 + }, + "group": "basemetals:diamond_slab" + } } diff --git a/src/generated/resources/data/basemetals/recipes/diamond_smallpowder.json b/src/generated/resources/data/basemetals/recipes/diamond_smallpowder.json index 1a00bafd..bf2ac1c1 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/diamond" - } - ], - "result": { - "item": "basemetals:diamond_smallpowder", - "count": 9 - }, - "group": "basemetals:diamond_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/diamond" + } + ], + "result": { + "item": "basemetals:diamond_smallpowder", + "count": 9 + }, + "group": "basemetals:diamond_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/diamond_stairs.json b/src/generated/resources/data/basemetals/recipes/diamond_stairs.json index 0c5cc6da..33c507a0 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_stairs.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X ", - "XX ", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/diamond" - } - }, - "result": { - "item": "basemetals:diamond_stairs", - "count": 4 - }, - "group": "basemetals:diamond_stairs" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/diamond" + } + }, + "result": { + "item": "basemetals:diamond_stairs", + "count": 4 + }, + "group": "basemetals:diamond_stairs" + } } diff --git a/src/generated/resources/data/basemetals/recipes/diamond_trapdoor.json b/src/generated/resources/data/basemetals/recipes/diamond_trapdoor.json index 8d126033..813a5487 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_trapdoor.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:gems/diamond" - } - }, - "result": { - "item": "basemetals:diamond_trapdoor" - }, - "group": "basemetals:diamond_trapdoor" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:gems/diamond" + } + }, + "result": { + "item": "basemetals:diamond_trapdoor" + }, + "group": "basemetals:diamond_trapdoor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/diamond_wall.json b/src/generated/resources/data/basemetals/recipes/diamond_wall.json index 0bb9ad00..8249d2e0 100644 --- a/src/generated/resources/data/basemetals/recipes/diamond_wall.json +++ b/src/generated/resources/data/basemetals/recipes/diamond_wall.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/diamond" - } - }, - "result": { - "item": "basemetals:diamond_wall", - "count": 6 - }, - "group": "basemetals:diamond_wall" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/diamond" + } + }, + "result": { + "item": "basemetals:diamond_wall", + "count": 6 + }, + "group": "basemetals:diamond_wall" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_arrow.json b/src/generated/resources/data/basemetals/recipes/electrum_arrow.json index dca07140..26d71269 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_arrow.json @@ -1,24 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "N", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "N", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "N": { + "tag": "forge:nuggets/electrum" + }, + "R": { + "tag": "forge:rods/electrum" + } }, - "N": { - "tag": "forge:nuggets/electrum" + "result": { + "item": "basemetals:electrum_arrow", + "count": 4 }, - "R": { - "tag": "forge:rods/electrum" - } - }, - "result": { - "item": "basemetals:electrum_arrow", - "count": 4 - }, - "group": "basemetals:electrum_arrow" + "group": "basemetals:electrum_arrow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_axe.json b/src/generated/resources/data/basemetals/recipes/electrum_axe.json index b865931e..67daa8dc 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_axe.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_axe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XS", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XS", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/electrum" + } }, - "X": { - "tag": "forge:ingots/electrum" - } - }, - "result": { - "item": "basemetals:electrum_axe" - }, - "group": "basemetals:electrum_axe" + "result": { + "item": "basemetals:electrum_axe" + }, + "group": "basemetals:electrum_axe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_bars.json b/src/generated/resources/data/basemetals/recipes/electrum_bars.json index cff8f419..41b4753f 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_bars.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_bars.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/electrum" - } - }, - "result": { - "item": "basemetals:electrum_bars", - "count": 16 - }, - "group": "basemetals:electrum_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/electrum" + } + }, + "result": { + "item": "basemetals:electrum_bars", + "count": 16 + }, + "group": "basemetals:electrum_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_bars_2.json b/src/generated/resources/data/basemetals/recipes/electrum_bars_2.json index a336a648..b48b215d 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_bars_2.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:rods/electrum" - } - }, - "result": { - "item": "basemetals:electrum_bars", - "count": 4 - }, - "group": "basemetals:electrum_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:rods/electrum" + } + }, + "result": { + "item": "basemetals:electrum_bars", + "count": 4 + }, + "group": "basemetals:electrum_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_blend.json b/src/generated/resources/data/basemetals/recipes/electrum_blend.json index dd3fc2fd..6d8322dc 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_blend.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_blend.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/gold" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/gold" + }, + { + "tag": "forge:dusts/silver" + } + ], + "result": { + "item": "basemetals:electrum_blend", + "count": 2 }, - { - "tag": "forge:dusts/silver" - } - ], - "result": { - "item": "basemetals:electrum_blend", - "count": 2 - }, - "group": "basemetals:electrum_blend" + "group": "basemetals:electrum_blend" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_blend_from_small.json b/src/generated/resources/data/basemetals/recipes/electrum_blend_from_small.json index 88971d88..ea3ec51d 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_blend_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_blend_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:small_blends/electrum" - } - }, - "result": { - "item": "basemetals:electrum_blend" - }, - "group": "basemetals:electrum_blend" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:small_blends/electrum" + } + }, + "result": { + "item": "basemetals:electrum_blend" + }, + "group": "basemetals:electrum_blend" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_block.json b/src/generated/resources/data/basemetals/recipes/electrum_block.json index a1c4c7eb..622cfb38 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_block.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_block.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/electrum" - } - }, - "result": { - "item": "basemetals:electrum_block" - }, - "group": "basemetals:electrum_block" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/electrum" + } + }, + "result": { + "item": "basemetals:electrum_block" + }, + "group": "basemetals:electrum_block" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_block_ingot.json b/src/generated/resources/data/basemetals/recipes/electrum_block_ingot.json index b9f2ae98..4a853b00 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_block_ingot.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/electrum" - } - ], - "result": { - "item": "basemetals:electrum_ingot", - "count": 9 - }, - "group": "basemetals:electrum_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/electrum" + } + ], + "result": { + "item": "basemetals:electrum_ingot", + "count": 9 + }, + "group": "basemetals:electrum_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_bolt.json b/src/generated/resources/data/basemetals/recipes/electrum_bolt.json index 10a9b7b2..5bc29627 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_bolt.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "R": { + "tag": "forge:rods/electrum" + } }, - "R": { - "tag": "forge:rods/electrum" - } - }, - "result": { - "item": "basemetals:electrum_bolt", - "count": 4 - }, - "group": "basemetals:electrum_bolt" + "result": { + "item": "basemetals:electrum_bolt", + "count": 4 + }, + "group": "basemetals:electrum_bolt" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_boots.json b/src/generated/resources/data/basemetals/recipes/electrum_boots.json index 3f8770e7..0bdef09a 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_boots.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_boots.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/electrum" - } - }, - "result": { - "item": "basemetals:electrum_boots" - }, - "group": "basemetals:electrum_boots" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/electrum" + } + }, + "result": { + "item": "basemetals:electrum_boots" + }, + "group": "basemetals:electrum_boots" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_bow.json b/src/generated/resources/data/basemetals/recipes/electrum_bow.json index 50468f81..3b8158f4 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_bow.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_bow.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " RS", - "R S", - " RS" - ], - "key": { - "R": { - "tag": "forge:rods/electrum" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " RS", + "R S", + " RS" + ], + "key": { + "R": { + "tag": "forge:rods/electrum" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:electrum_bow" - }, - "group": "basemetals:electrum_bow" + "result": { + "item": "basemetals:electrum_bow" + }, + "group": "basemetals:electrum_bow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_button.json b/src/generated/resources/data/basemetals/recipes/electrum_button.json index 8ed86019..458a0738 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_button.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_button.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:nuggets/electrum" - } - }, - "result": { - "item": "basemetals:electrum_button" - }, - "group": "basemetals:electrum_button" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:nuggets/electrum" + } + }, + "result": { + "item": "basemetals:electrum_button" + }, + "group": "basemetals:electrum_button" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_chestplate.json b/src/generated/resources/data/basemetals/recipes/electrum_chestplate.json index cb5e7b04..d50a011d 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_chestplate.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/electrum" - } - }, - "result": { - "item": "basemetals:electrum_chestplate" - }, - "group": "basemetals:electrum_chestplate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/electrum" + } + }, + "result": { + "item": "basemetals:electrum_chestplate" + }, + "group": "basemetals:electrum_chestplate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_crackhammer.json b/src/generated/resources/data/basemetals/recipes/electrum_crackhammer.json index df760a74..45b7134a 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:storage_blocks/electrum" + } }, - "X": { - "tag": "forge:storage_blocks/electrum" - } - }, - "result": { - "item": "basemetals:electrum_crackhammer" - }, - "group": "basemetals:electrum_crackhammer" + "result": { + "item": "basemetals:electrum_crackhammer" + }, + "group": "basemetals:electrum_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_crossbow.json b/src/generated/resources/data/basemetals/recipes/electrum_crossbow.json index 4b6cde8d..2c81fbcc 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_crossbow.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRR", - " SR", - "R G" - ], - "key": { - "G": { - "tag": "forge:gears/electrum" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRR", + " SR", + "R G" + ], + "key": { + "G": { + "tag": "forge:gears/electrum" + }, + "R": { + "tag": "forge:rods/electrum" + }, + "S": { + "item": "minecraft:string" + } }, - "R": { - "tag": "forge:rods/electrum" + "result": { + "item": "basemetals:electrum_crossbow" }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:electrum_crossbow" - }, - "group": "basemetals:electrum_crossbow" + "group": "basemetals:electrum_crossbow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_door.json b/src/generated/resources/data/basemetals/recipes/electrum_door.json index 954281b3..93f17a1b 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_door.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_door.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/electrum" - } - }, - "result": { - "item": "basemetals:electrum_door", - "count": 3 - }, - "group": "basemetals:electrum_door" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/electrum" + } + }, + "result": { + "item": "basemetals:electrum_door", + "count": 3 + }, + "group": "basemetals:electrum_door" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_fishingrod.json b/src/generated/resources/data/basemetals/recipes/electrum_fishingrod.json index f84e9915..f23d39b9 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_fishingrod.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " R", - " RS", - "R S" - ], - "key": { - "R": { - "tag": "forge:rods/electrum" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " R", + " RS", + "R S" + ], + "key": { + "R": { + "tag": "forge:rods/electrum" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:electrum_fishing_rod" - }, - "group": "basemetals:electrum_fishing_rod" + "result": { + "item": "basemetals:electrum_fishing_rod" + }, + "group": "basemetals:electrum_fishing_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_gear.json b/src/generated/resources/data/basemetals/recipes/electrum_gear.json index 6c3413c1..856572df 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_gear.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_gear.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "XRX", - " X " - ], - "key": { - "R": { - "tag": "forge:rods/electrum" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XRX", + " X " + ], + "key": { + "R": { + "tag": "forge:rods/electrum" + }, + "X": { + "tag": "forge:ingots/electrum" + } }, - "X": { - "tag": "forge:ingots/electrum" - } - }, - "result": { - "item": "basemetals:electrum_gear", - "count": 4 - }, - "group": "basemetals:electrum_gear" + "result": { + "item": "basemetals:electrum_gear", + "count": 4 + }, + "group": "basemetals:electrum_gear" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_helmet.json b/src/generated/resources/data/basemetals/recipes/electrum_helmet.json index 60ecee25..311176e0 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_helmet.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/electrum" - } - }, - "result": { - "item": "basemetals:electrum_helmet" - }, - "group": "basemetals:electrum_helmet" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/electrum" + } + }, + "result": { + "item": "basemetals:electrum_helmet" + }, + "group": "basemetals:electrum_helmet" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_hoe.json b/src/generated/resources/data/basemetals/recipes/electrum_hoe.json index b64c963f..6032929f 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_hoe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - " S", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " S", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/electrum" + } }, - "X": { - "tag": "forge:ingots/electrum" - } - }, - "result": { - "item": "basemetals:electrum_hoe" - }, - "group": "basemetals:electrum_hoe" + "result": { + "item": "basemetals:electrum_hoe" + }, + "group": "basemetals:electrum_hoe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_horsearmor.json b/src/generated/resources/data/basemetals/recipes/electrum_horsearmor.json index 3f9ab388..ec0c4b0a 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_horsearmor.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "XWX", - "XXX" - ], - "key": { - "W": { - "tag": "minecraft:wool" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "XWX", + "XXX" + ], + "key": { + "W": { + "tag": "minecraft:wool" + }, + "X": { + "tag": "forge:ingots/electrum" + } }, - "X": { - "tag": "forge:ingots/electrum" - } - }, - "result": { - "item": "basemetals:electrum_horse_armor" - }, - "group": "basemetals:electrum_horse_armor" + "result": { + "item": "basemetals:electrum_horse_armor" + }, + "group": "basemetals:electrum_horse_armor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/electrum_ingot_from_nuggets.json index 604b9899..3ce82d31 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_ingot_from_nuggets.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:nuggets/electrum" - } - }, - "result": { - "item": "basemetals:electrum_ingot" - }, - "group": "basemetals:electrum_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:nuggets/electrum" + } + }, + "result": { + "item": "basemetals:electrum_ingot" + }, + "group": "basemetals:electrum_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_leggings.json b/src/generated/resources/data/basemetals/recipes/electrum_leggings.json index 60452880..6c6a8bbf 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_leggings.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/electrum" - } - }, - "result": { - "item": "basemetals:electrum_leggings" - }, - "group": "basemetals:electrum_leggings" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/electrum" + } + }, + "result": { + "item": "basemetals:electrum_leggings" + }, + "group": "basemetals:electrum_leggings" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_lever.json b/src/generated/resources/data/basemetals/recipes/electrum_lever.json index 64bca9a5..4556bac3 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_lever.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_lever.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "X" - ], - "key": { - "R": { - "tag": "forge:rods/electrum" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "X" + ], + "key": { + "R": { + "tag": "forge:rods/electrum" + }, + "X": { + "tag": "forge:ingots/electrum" + } }, - "X": { - "tag": "forge:ingots/electrum" - } - }, - "result": { - "item": "basemetals:electrum_lever" - }, - "group": "basemetals:electrum_lever" + "result": { + "item": "basemetals:electrum_lever" + }, + "group": "basemetals:electrum_lever" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_nuggets.json b/src/generated/resources/data/basemetals/recipes/electrum_nuggets.json index 06b0c5fe..849f4fd1 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_nuggets.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:ingots/electrum" - } - ], - "result": { - "item": "basemetals:electrum_nugget", - "count": 9 - }, - "group": "basemetals:electrum_nugget" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/electrum" + } + ], + "result": { + "item": "basemetals:electrum_nugget", + "count": 9 + }, + "group": "basemetals:electrum_nugget" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_pickaxe.json b/src/generated/resources/data/basemetals/recipes/electrum_pickaxe.json index 6d04ef1b..c7a87106 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_pickaxe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " S ", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " S ", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/electrum" + } }, - "X": { - "tag": "forge:ingots/electrum" - } - }, - "result": { - "item": "basemetals:electrum_pickaxe" - }, - "group": "basemetals:electrum_pickaxe" + "result": { + "item": "basemetals:electrum_pickaxe" + }, + "group": "basemetals:electrum_pickaxe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_plate.json b/src/generated/resources/data/basemetals/recipes/electrum_plate.json index 3d4ce1c9..404497c0 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_plate.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_plate.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/electrum" - } - }, - "result": { - "item": "basemetals:electrum_plate", - "count": 3 - }, - "group": "basemetals:electrum_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/electrum" + } + }, + "result": { + "item": "basemetals:electrum_plate", + "count": 3 + }, + "group": "basemetals:electrum_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/electrum_powder_from_small.json index 6e4886d1..69fc5304 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/electrum" - } - }, - "result": { - "item": "basemetals:electrum_powder" - }, - "group": "basemetals:electrum_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/electrum" + } + }, + "result": { + "item": "basemetals:electrum_powder" + }, + "group": "basemetals:electrum_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/electrum_pressure_plate.json index 87578c0d..bc86c997 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_pressure_plate.json @@ -1,15 +1,18 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/electrum" - } - }, - "result": { - "item": "basemetals:electrum_pressure_plate" - }, - "group": "basemetals:electrum_pressure_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/electrum" + } + }, + "result": { + "item": "basemetals:electrum_pressure_plate" + }, + "group": "basemetals:electrum_pressure_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_rod.json b/src/generated/resources/data/basemetals/recipes/electrum_rod.json index 93fc3e16..45ff3fe5 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_rod.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_rod.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:ingots/electrum" - } - }, - "result": { - "item": "basemetals:electrum_rod", - "count": 4 - }, - "group": "basemetals:electrum_rod" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:ingots/electrum" + } + }, + "result": { + "item": "basemetals:electrum_rod", + "count": 4 + }, + "group": "basemetals:electrum_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_scythe.json b/src/generated/resources/data/basemetals/recipes/electrum_scythe.json index 7a593260..696e8522 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/electrum" + } }, - "X": { - "tag": "forge:ingots/electrum" - } - }, - "result": { - "item": "basemetals:electrum_scythe" - }, - "group": "basemetals:electrum_scythe" + "result": { + "item": "basemetals:electrum_scythe" + }, + "group": "basemetals:electrum_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_shears.json b/src/generated/resources/data/basemetals/recipes/electrum_shears.json index 02314d72..160fe0f1 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_shears.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_shears.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "X " - ], - "key": { - "X": { - "tag": "forge:ingots/electrum" - } - }, - "result": { - "item": "basemetals:electrum_shears" - }, - "group": "basemetals:electrum_shears" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "X " + ], + "key": { + "X": { + "tag": "forge:ingots/electrum" + } + }, + "result": { + "item": "basemetals:electrum_shears" + }, + "group": "basemetals:electrum_shears" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_shield.json b/src/generated/resources/data/basemetals/recipes/electrum_shield.json index eaebf91b..fbd1af8a 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_shield.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_shield.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XWX", - "XXX", - " X " - ], - "key": { - "W": { - "tag": "minecraft:planks" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XWX", + "XXX", + " X " + ], + "key": { + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:ingots/electrum" + } }, - "X": { - "tag": "forge:ingots/electrum" - } - }, - "result": { - "item": "basemetals:electrum_shield" - }, - "group": "basemetals:electrum_shield" + "result": { + "item": "basemetals:electrum_shield" + }, + "group": "basemetals:electrum_shield" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_shovel.json b/src/generated/resources/data/basemetals/recipes/electrum_shovel.json index 19cfccb3..f21f566a 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_shovel.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/electrum" + } }, - "X": { - "tag": "forge:ingots/electrum" - } - }, - "result": { - "item": "basemetals:electrum_shovel" - }, - "group": "basemetals:electrum_shovel" + "result": { + "item": "basemetals:electrum_shovel" + }, + "group": "basemetals:electrum_shovel" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_slab.json b/src/generated/resources/data/basemetals/recipes/electrum_slab.json index 5cc4202e..c8b0548c 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_slab.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_slab.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/electrum" - } - }, - "result": { - "item": "basemetals:electrum_slab", - "count": 6 - }, - "group": "basemetals:electrum_slab" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/electrum" + } + }, + "result": { + "item": "basemetals:electrum_slab", + "count": 6 + }, + "group": "basemetals:electrum_slab" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_smallblend.json b/src/generated/resources/data/basemetals/recipes/electrum_smallblend.json index ef722380..54fd0ef6 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_smallblend.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_smallblend.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:blends/electrum" - } - ], - "result": { - "item": "basemetals:electrum_smallblend", - "count": 9 - }, - "group": "basemetals:electrum_smallblend" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:blends/electrum" + } + ], + "result": { + "item": "basemetals:electrum_smallblend", + "count": 9 + }, + "group": "basemetals:electrum_smallblend" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_smallpowder.json b/src/generated/resources/data/basemetals/recipes/electrum_smallpowder.json index f2476c19..323eb185 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/electrum" - } - ], - "result": { - "item": "basemetals:electrum_smallpowder", - "count": 9 - }, - "group": "basemetals:electrum_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/electrum" + } + ], + "result": { + "item": "basemetals:electrum_smallpowder", + "count": 9 + }, + "group": "basemetals:electrum_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_stairs.json b/src/generated/resources/data/basemetals/recipes/electrum_stairs.json index 2997a047..4df36590 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_stairs.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X ", - "XX ", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/electrum" - } - }, - "result": { - "item": "basemetals:electrum_stairs", - "count": 4 - }, - "group": "basemetals:electrum_stairs" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/electrum" + } + }, + "result": { + "item": "basemetals:electrum_stairs", + "count": 4 + }, + "group": "basemetals:electrum_stairs" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_sword.json b/src/generated/resources/data/basemetals/recipes/electrum_sword.json index a9d683aa..2415e1fc 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_sword.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_sword.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/electrum" + } }, - "X": { - "tag": "forge:ingots/electrum" - } - }, - "result": { - "item": "basemetals:electrum_sword" - }, - "group": "basemetals:electrum_sword" + "result": { + "item": "basemetals:electrum_sword" + }, + "group": "basemetals:electrum_sword" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_trapdoor.json b/src/generated/resources/data/basemetals/recipes/electrum_trapdoor.json index 919eea79..46f5bb5e 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_trapdoor.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/electrum" - } - }, - "result": { - "item": "basemetals:electrum_trapdoor" - }, - "group": "basemetals:electrum_trapdoor" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/electrum" + } + }, + "result": { + "item": "basemetals:electrum_trapdoor" + }, + "group": "basemetals:electrum_trapdoor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/electrum_wall.json b/src/generated/resources/data/basemetals/recipes/electrum_wall.json index e322335c..f723a1ba 100644 --- a/src/generated/resources/data/basemetals/recipes/electrum_wall.json +++ b/src/generated/resources/data/basemetals/recipes/electrum_wall.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/electrum" - } - }, - "result": { - "item": "basemetals:electrum_wall", - "count": 6 - }, - "group": "basemetals:electrum_wall" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/electrum" + } + }, + "result": { + "item": "basemetals:electrum_wall", + "count": 6 + }, + "group": "basemetals:electrum_wall" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_arrow.json b/src/generated/resources/data/basemetals/recipes/emerald_arrow.json index 94f5aced..4c267e69 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_arrow.json @@ -1,24 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "N", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "N", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "N": { + "tag": "forge:nuggets/emerald" + }, + "R": { + "tag": "forge:rods/emerald" + } }, - "N": { - "tag": "forge:nuggets/emerald" + "result": { + "item": "basemetals:emerald_arrow", + "count": 4 }, - "R": { - "tag": "forge:rods/emerald" - } - }, - "result": { - "item": "basemetals:emerald_arrow", - "count": 4 - }, - "group": "basemetals:emerald_arrow" + "group": "basemetals:emerald_arrow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_axe.json b/src/generated/resources/data/basemetals/recipes/emerald_axe.json index d79d2edc..e3e0ce78 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_axe.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_axe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XS", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XS", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:gems/emerald" + } }, - "X": { - "tag": "forge:gems/emerald" - } - }, - "result": { - "item": "basemetals:emerald_axe" - }, - "group": "basemetals:emerald_axe" + "result": { + "item": "basemetals:emerald_axe" + }, + "group": "basemetals:emerald_axe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_bars.json b/src/generated/resources/data/basemetals/recipes/emerald_bars.json index 62f4dd10..5f393b42 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_bars.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_bars.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:gems/emerald" - } - }, - "result": { - "item": "basemetals:emerald_bars", - "count": 16 - }, - "group": "basemetals:emerald_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:gems/emerald" + } + }, + "result": { + "item": "basemetals:emerald_bars", + "count": 16 + }, + "group": "basemetals:emerald_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_bars_2.json b/src/generated/resources/data/basemetals/recipes/emerald_bars_2.json index 9a10e1c6..fe6f3c2a 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_bars_2.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:rods/emerald" - } - }, - "result": { - "item": "basemetals:emerald_bars", - "count": 4 - }, - "group": "basemetals:emerald_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:rods/emerald" + } + }, + "result": { + "item": "basemetals:emerald_bars", + "count": 4 + }, + "group": "basemetals:emerald_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_bolt.json b/src/generated/resources/data/basemetals/recipes/emerald_bolt.json index 5cea4e2e..8b0236df 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_bolt.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "R": { + "tag": "forge:rods/emerald" + } }, - "R": { - "tag": "forge:rods/emerald" - } - }, - "result": { - "item": "basemetals:emerald_bolt", - "count": 4 - }, - "group": "basemetals:emerald_bolt" + "result": { + "item": "basemetals:emerald_bolt", + "count": 4 + }, + "group": "basemetals:emerald_bolt" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_boots.json b/src/generated/resources/data/basemetals/recipes/emerald_boots.json index 1fcccd1f..95756a67 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_boots.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_boots.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:gems/emerald" - } - }, - "result": { - "item": "basemetals:emerald_boots" - }, - "group": "basemetals:emerald_boots" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:gems/emerald" + } + }, + "result": { + "item": "basemetals:emerald_boots" + }, + "group": "basemetals:emerald_boots" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_bow.json b/src/generated/resources/data/basemetals/recipes/emerald_bow.json index ebf7afe2..1210db7d 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_bow.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_bow.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " RS", - "R S", - " RS" - ], - "key": { - "R": { - "tag": "forge:rods/emerald" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " RS", + "R S", + " RS" + ], + "key": { + "R": { + "tag": "forge:rods/emerald" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:emerald_bow" - }, - "group": "basemetals:emerald_bow" + "result": { + "item": "basemetals:emerald_bow" + }, + "group": "basemetals:emerald_bow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_button.json b/src/generated/resources/data/basemetals/recipes/emerald_button.json index b80a337a..7a81f5b5 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_button.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_button.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:nuggets/emerald" - } - }, - "result": { - "item": "basemetals:emerald_button" - }, - "group": "basemetals:emerald_button" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:nuggets/emerald" + } + }, + "result": { + "item": "basemetals:emerald_button" + }, + "group": "basemetals:emerald_button" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_chestplate.json b/src/generated/resources/data/basemetals/recipes/emerald_chestplate.json index 1ce88f9f..be3e164d 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_chestplate.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:gems/emerald" - } - }, - "result": { - "item": "basemetals:emerald_chestplate" - }, - "group": "basemetals:emerald_chestplate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:gems/emerald" + } + }, + "result": { + "item": "basemetals:emerald_chestplate" + }, + "group": "basemetals:emerald_chestplate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_crackhammer.json b/src/generated/resources/data/basemetals/recipes/emerald_crackhammer.json index c5629877..85b0316a 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:storage_blocks/emerald" + } }, - "X": { - "tag": "forge:storage_blocks/emerald" - } - }, - "result": { - "item": "basemetals:emerald_crackhammer" - }, - "group": "basemetals:emerald_crackhammer" + "result": { + "item": "basemetals:emerald_crackhammer" + }, + "group": "basemetals:emerald_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_crossbow.json b/src/generated/resources/data/basemetals/recipes/emerald_crossbow.json index 4453984b..065994a5 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_crossbow.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRR", - " SR", - "R G" - ], - "key": { - "G": { - "tag": "forge:gears/emerald" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRR", + " SR", + "R G" + ], + "key": { + "G": { + "tag": "forge:gears/emerald" + }, + "R": { + "tag": "forge:rods/emerald" + }, + "S": { + "item": "minecraft:string" + } }, - "R": { - "tag": "forge:rods/emerald" + "result": { + "item": "basemetals:emerald_crossbow" }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:emerald_crossbow" - }, - "group": "basemetals:emerald_crossbow" + "group": "basemetals:emerald_crossbow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_door.json b/src/generated/resources/data/basemetals/recipes/emerald_door.json index 3c35c825..cacb2fa1 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_door.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_door.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:gems/emerald" - } - }, - "result": { - "item": "basemetals:emerald_door", - "count": 3 - }, - "group": "basemetals:emerald_door" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:gems/emerald" + } + }, + "result": { + "item": "basemetals:emerald_door", + "count": 3 + }, + "group": "basemetals:emerald_door" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_fishingrod.json b/src/generated/resources/data/basemetals/recipes/emerald_fishingrod.json index 69b3c7a0..38b56f5b 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_fishingrod.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " R", - " RS", - "R S" - ], - "key": { - "R": { - "tag": "forge:rods/emerald" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " R", + " RS", + "R S" + ], + "key": { + "R": { + "tag": "forge:rods/emerald" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:emerald_fishing_rod" - }, - "group": "basemetals:emerald_fishing_rod" + "result": { + "item": "basemetals:emerald_fishing_rod" + }, + "group": "basemetals:emerald_fishing_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_gear.json b/src/generated/resources/data/basemetals/recipes/emerald_gear.json index 4ac9daaa..dbdbbdd7 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_gear.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_gear.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "XRX", - " X " - ], - "key": { - "R": { - "tag": "forge:rods/iron" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XRX", + " X " + ], + "key": { + "R": { + "tag": "forge:rods/iron" + }, + "X": { + "tag": "forge:gems/emerald" + } }, - "X": { - "tag": "forge:gems/emerald" - } - }, - "result": { - "item": "basemetals:emerald_gear", - "count": 4 - }, - "group": "basemetals:emerald_gear" + "result": { + "item": "basemetals:emerald_gear", + "count": 4 + }, + "group": "basemetals:emerald_gear" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_helmet.json b/src/generated/resources/data/basemetals/recipes/emerald_helmet.json index d8213ec9..9b12f489 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_helmet.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X" - ], - "key": { - "X": { - "tag": "forge:gems/emerald" - } - }, - "result": { - "item": "basemetals:emerald_helmet" - }, - "group": "basemetals:emerald_helmet" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X" + ], + "key": { + "X": { + "tag": "forge:gems/emerald" + } + }, + "result": { + "item": "basemetals:emerald_helmet" + }, + "group": "basemetals:emerald_helmet" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_hoe.json b/src/generated/resources/data/basemetals/recipes/emerald_hoe.json index 25e58aac..804f8849 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_hoe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - " S", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " S", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:gems/emerald" + } }, - "X": { - "tag": "forge:gems/emerald" - } - }, - "result": { - "item": "basemetals:emerald_hoe" - }, - "group": "basemetals:emerald_hoe" + "result": { + "item": "basemetals:emerald_hoe" + }, + "group": "basemetals:emerald_hoe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_horsearmor.json b/src/generated/resources/data/basemetals/recipes/emerald_horsearmor.json index e2041e2c..b85925a2 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_horsearmor.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "XWX", - "XXX" - ], - "key": { - "W": { - "tag": "minecraft:wool" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "XWX", + "XXX" + ], + "key": { + "W": { + "tag": "minecraft:wool" + }, + "X": { + "tag": "forge:gems/emerald" + } }, - "X": { - "tag": "forge:gems/emerald" - } - }, - "result": { - "item": "basemetals:emerald_horse_armor" - }, - "group": "basemetals:emerald_horse_armor" + "result": { + "item": "basemetals:emerald_horse_armor" + }, + "group": "basemetals:emerald_horse_armor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_leggings.json b/src/generated/resources/data/basemetals/recipes/emerald_leggings.json index 4d36272b..248681d5 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_leggings.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:gems/emerald" - } - }, - "result": { - "item": "basemetals:emerald_leggings" - }, - "group": "basemetals:emerald_leggings" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:gems/emerald" + } + }, + "result": { + "item": "basemetals:emerald_leggings" + }, + "group": "basemetals:emerald_leggings" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_lever.json b/src/generated/resources/data/basemetals/recipes/emerald_lever.json index 41f7f8d1..fa2cc535 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_lever.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_lever.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "X" - ], - "key": { - "R": { - "tag": "forge:rods/emerald" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "X" + ], + "key": { + "R": { + "tag": "forge:rods/emerald" + }, + "X": { + "tag": "forge:gems/emerald" + } }, - "X": { - "tag": "forge:gems/emerald" - } - }, - "result": { - "item": "basemetals:emerald_lever" - }, - "group": "basemetals:emerald_lever" + "result": { + "item": "basemetals:emerald_lever" + }, + "group": "basemetals:emerald_lever" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_pickaxe.json b/src/generated/resources/data/basemetals/recipes/emerald_pickaxe.json index 5f77b1f7..b424ebe9 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_pickaxe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " S ", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " S ", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:gems/emerald" + } }, - "X": { - "tag": "forge:gems/emerald" - } - }, - "result": { - "item": "basemetals:emerald_pickaxe" - }, - "group": "basemetals:emerald_pickaxe" + "result": { + "item": "basemetals:emerald_pickaxe" + }, + "group": "basemetals:emerald_pickaxe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/emerald_powder_from_small.json index bac7e784..1f3a0eb1 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/emerald" - } - }, - "result": { - "item": "basemetals:emerald_powder" - }, - "group": "basemetals:emerald_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/emerald" + } + }, + "result": { + "item": "basemetals:emerald_powder" + }, + "group": "basemetals:emerald_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/emerald_pressure_plate.json index 551881a4..14546daa 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_pressure_plate.json @@ -1,15 +1,18 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX" - ], - "key": { - "X": { - "tag": "forge:gems/emerald" - } - }, - "result": { - "item": "basemetals:emerald_pressure_plate" - }, - "group": "basemetals:emerald_pressure_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX" + ], + "key": { + "X": { + "tag": "forge:gems/emerald" + } + }, + "result": { + "item": "basemetals:emerald_pressure_plate" + }, + "group": "basemetals:emerald_pressure_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_rod.json b/src/generated/resources/data/basemetals/recipes/emerald_rod.json index 6d6cc0df..7da751f8 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_rod.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_rod.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:gems/emerald" - } - }, - "result": { - "item": "basemetals:emerald_rod", - "count": 4 - }, - "group": "basemetals:emerald_rod" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:gems/emerald" + } + }, + "result": { + "item": "basemetals:emerald_rod", + "count": 4 + }, + "group": "basemetals:emerald_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_scythe.json b/src/generated/resources/data/basemetals/recipes/emerald_scythe.json index 23899e6c..dfa2dd7c 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:gems/emerald" + } }, - "X": { - "tag": "forge:gems/emerald" - } - }, - "result": { - "item": "basemetals:emerald_scythe" - }, - "group": "basemetals:emerald_scythe" + "result": { + "item": "basemetals:emerald_scythe" + }, + "group": "basemetals:emerald_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_shears.json b/src/generated/resources/data/basemetals/recipes/emerald_shears.json index 3775d4ac..be0d6e42 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_shears.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_shears.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "X " - ], - "key": { - "X": { - "tag": "forge:gems/emerald" - } - }, - "result": { - "item": "basemetals:emerald_shears" - }, - "group": "basemetals:emerald_shears" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "X " + ], + "key": { + "X": { + "tag": "forge:gems/emerald" + } + }, + "result": { + "item": "basemetals:emerald_shears" + }, + "group": "basemetals:emerald_shears" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_shield.json b/src/generated/resources/data/basemetals/recipes/emerald_shield.json index 609b5449..2486b574 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_shield.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_shield.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XWX", - "XXX", - " X " - ], - "key": { - "W": { - "tag": "minecraft:planks" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XWX", + "XXX", + " X " + ], + "key": { + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:gems/emerald" + } }, - "X": { - "tag": "forge:gems/emerald" - } - }, - "result": { - "item": "basemetals:emerald_shield" - }, - "group": "basemetals:emerald_shield" + "result": { + "item": "basemetals:emerald_shield" + }, + "group": "basemetals:emerald_shield" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_shovel.json b/src/generated/resources/data/basemetals/recipes/emerald_shovel.json index 16155023..9102dd36 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_shovel.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:gems/emerald" + } }, - "X": { - "tag": "forge:gems/emerald" - } - }, - "result": { - "item": "basemetals:emerald_shovel" - }, - "group": "basemetals:emerald_shovel" + "result": { + "item": "basemetals:emerald_shovel" + }, + "group": "basemetals:emerald_shovel" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_slab.json b/src/generated/resources/data/basemetals/recipes/emerald_slab.json index f3055220..ee3d9c02 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_slab.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_slab.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/emerald" - } - }, - "result": { - "item": "basemetals:emerald_slab", - "count": 6 - }, - "group": "basemetals:emerald_slab" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/emerald" + } + }, + "result": { + "item": "basemetals:emerald_slab", + "count": 6 + }, + "group": "basemetals:emerald_slab" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_smallpowder.json b/src/generated/resources/data/basemetals/recipes/emerald_smallpowder.json index ba401949..e40b7c10 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/emerald" - } - ], - "result": { - "item": "basemetals:emerald_smallpowder", - "count": 9 - }, - "group": "basemetals:emerald_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/emerald" + } + ], + "result": { + "item": "basemetals:emerald_smallpowder", + "count": 9 + }, + "group": "basemetals:emerald_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_stairs.json b/src/generated/resources/data/basemetals/recipes/emerald_stairs.json index 2cc3bf07..41a8f6ef 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_stairs.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X ", - "XX ", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/emerald" - } - }, - "result": { - "item": "basemetals:emerald_stairs", - "count": 4 - }, - "group": "basemetals:emerald_stairs" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/emerald" + } + }, + "result": { + "item": "basemetals:emerald_stairs", + "count": 4 + }, + "group": "basemetals:emerald_stairs" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_sword.json b/src/generated/resources/data/basemetals/recipes/emerald_sword.json index f7f87e2f..855a2ad8 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_sword.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_sword.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:gems/emerald" + } }, - "X": { - "tag": "forge:gems/emerald" - } - }, - "result": { - "item": "basemetals:emerald_sword" - }, - "group": "basemetals:emerald_sword" + "result": { + "item": "basemetals:emerald_sword" + }, + "group": "basemetals:emerald_sword" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_trapdoor.json b/src/generated/resources/data/basemetals/recipes/emerald_trapdoor.json index c7893190..ac3f4c7e 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_trapdoor.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:gems/emerald" - } - }, - "result": { - "item": "basemetals:emerald_trapdoor" - }, - "group": "basemetals:emerald_trapdoor" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:gems/emerald" + } + }, + "result": { + "item": "basemetals:emerald_trapdoor" + }, + "group": "basemetals:emerald_trapdoor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/emerald_wall.json b/src/generated/resources/data/basemetals/recipes/emerald_wall.json index 0c0027b0..78298e78 100644 --- a/src/generated/resources/data/basemetals/recipes/emerald_wall.json +++ b/src/generated/resources/data/basemetals/recipes/emerald_wall.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/emerald" - } - }, - "result": { - "item": "basemetals:emerald_wall", - "count": 6 - }, - "group": "basemetals:emerald_wall" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/emerald" + } + }, + "result": { + "item": "basemetals:emerald_wall", + "count": 6 + }, + "group": "basemetals:emerald_wall" + } } diff --git a/src/generated/resources/data/basemetals/recipes/flint_and_steel.json b/src/generated/resources/data/basemetals/recipes/flint_and_steel.json index 00535c0e..479bdb31 100644 --- a/src/generated/resources/data/basemetals/recipes/flint_and_steel.json +++ b/src/generated/resources/data/basemetals/recipes/flint_and_steel.json @@ -1,15 +1,18 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:ingots/steel" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/steel" + }, + { + "item": "minecraft:flint" + } + ], + "result": { + "item": "minecraft:flint_and_steel" }, - { - "item": "minecraft:flint" - } - ], - "result": { - "item": "minecraft:flint_and_steel" - }, - "group": "minecraft:flint_and_steel" + "group": "minecraft:flint_and_steel" + } } diff --git a/src/generated/resources/data/basemetals/recipes/gold_arrow.json b/src/generated/resources/data/basemetals/recipes/gold_arrow.json index 906c0639..9e21c2d4 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/gold_arrow.json @@ -1,24 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "N", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "N", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "N": { + "tag": "forge:nuggets/gold" + }, + "R": { + "tag": "forge:rods/gold" + } }, - "N": { - "tag": "forge:nuggets/gold" + "result": { + "item": "basemetals:gold_arrow", + "count": 4 }, - "R": { - "tag": "forge:rods/gold" - } - }, - "result": { - "item": "basemetals:gold_arrow", - "count": 4 - }, - "group": "basemetals:gold_arrow" + "group": "basemetals:gold_arrow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/gold_bars.json b/src/generated/resources/data/basemetals/recipes/gold_bars.json index f2114ddc..a5355af7 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_bars.json +++ b/src/generated/resources/data/basemetals/recipes/gold_bars.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/gold" - } - }, - "result": { - "item": "basemetals:gold_bars", - "count": 16 - }, - "group": "basemetals:gold_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/gold" + } + }, + "result": { + "item": "basemetals:gold_bars", + "count": 16 + }, + "group": "basemetals:gold_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/gold_bars_2.json b/src/generated/resources/data/basemetals/recipes/gold_bars_2.json index 413293c4..c3f1385c 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/gold_bars_2.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:rods/gold" - } - }, - "result": { - "item": "basemetals:gold_bars", - "count": 4 - }, - "group": "basemetals:gold_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:rods/gold" + } + }, + "result": { + "item": "basemetals:gold_bars", + "count": 4 + }, + "group": "basemetals:gold_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/gold_bolt.json b/src/generated/resources/data/basemetals/recipes/gold_bolt.json index d69b515a..6d2bde90 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/gold_bolt.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "R": { + "tag": "forge:rods/gold" + } }, - "R": { - "tag": "forge:rods/gold" - } - }, - "result": { - "item": "basemetals:gold_bolt", - "count": 4 - }, - "group": "basemetals:gold_bolt" + "result": { + "item": "basemetals:gold_bolt", + "count": 4 + }, + "group": "basemetals:gold_bolt" + } } diff --git a/src/generated/resources/data/basemetals/recipes/gold_bow.json b/src/generated/resources/data/basemetals/recipes/gold_bow.json index a1d894e8..11c4c7e8 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_bow.json +++ b/src/generated/resources/data/basemetals/recipes/gold_bow.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " RS", - "R S", - " RS" - ], - "key": { - "R": { - "tag": "forge:rods/gold" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " RS", + "R S", + " RS" + ], + "key": { + "R": { + "tag": "forge:rods/gold" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:gold_bow" - }, - "group": "basemetals:gold_bow" + "result": { + "item": "basemetals:gold_bow" + }, + "group": "basemetals:gold_bow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/gold_button.json b/src/generated/resources/data/basemetals/recipes/gold_button.json index 1ef7fb73..c181e8a2 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_button.json +++ b/src/generated/resources/data/basemetals/recipes/gold_button.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:nuggets/gold" - } - }, - "result": { - "item": "basemetals:gold_button" - }, - "group": "basemetals:gold_button" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:nuggets/gold" + } + }, + "result": { + "item": "basemetals:gold_button" + }, + "group": "basemetals:gold_button" + } } diff --git a/src/generated/resources/data/basemetals/recipes/gold_crackhammer.json b/src/generated/resources/data/basemetals/recipes/gold_crackhammer.json index 79b9710f..1806eced 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/gold_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:storage_blocks/gold" + } }, - "X": { - "tag": "forge:storage_blocks/gold" - } - }, - "result": { - "item": "basemetals:gold_crackhammer" - }, - "group": "basemetals:gold_crackhammer" + "result": { + "item": "basemetals:gold_crackhammer" + }, + "group": "basemetals:gold_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/gold_crossbow.json b/src/generated/resources/data/basemetals/recipes/gold_crossbow.json index 4a3e6d22..0d3bbc87 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/gold_crossbow.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRR", - " SR", - "R G" - ], - "key": { - "G": { - "tag": "forge:gears/gold" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRR", + " SR", + "R G" + ], + "key": { + "G": { + "tag": "forge:gears/gold" + }, + "R": { + "tag": "forge:rods/gold" + }, + "S": { + "item": "minecraft:string" + } }, - "R": { - "tag": "forge:rods/gold" + "result": { + "item": "basemetals:gold_crossbow" }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:gold_crossbow" - }, - "group": "basemetals:gold_crossbow" + "group": "basemetals:gold_crossbow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/gold_door.json b/src/generated/resources/data/basemetals/recipes/gold_door.json index ef104f7c..910e045a 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_door.json +++ b/src/generated/resources/data/basemetals/recipes/gold_door.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/gold" - } - }, - "result": { - "item": "basemetals:gold_door", - "count": 3 - }, - "group": "basemetals:gold_door" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/gold" + } + }, + "result": { + "item": "basemetals:gold_door", + "count": 3 + }, + "group": "basemetals:gold_door" + } } diff --git a/src/generated/resources/data/basemetals/recipes/gold_fishingrod.json b/src/generated/resources/data/basemetals/recipes/gold_fishingrod.json index b6b27e36..f30dda39 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/gold_fishingrod.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " R", - " RS", - "R S" - ], - "key": { - "R": { - "tag": "forge:rods/gold" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " R", + " RS", + "R S" + ], + "key": { + "R": { + "tag": "forge:rods/gold" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:gold_fishing_rod" - }, - "group": "basemetals:gold_fishing_rod" + "result": { + "item": "basemetals:gold_fishing_rod" + }, + "group": "basemetals:gold_fishing_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/gold_gear.json b/src/generated/resources/data/basemetals/recipes/gold_gear.json index 57572758..69567605 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_gear.json +++ b/src/generated/resources/data/basemetals/recipes/gold_gear.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "XRX", - " X " - ], - "key": { - "R": { - "tag": "forge:rods/gold" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XRX", + " X " + ], + "key": { + "R": { + "tag": "forge:rods/gold" + }, + "X": { + "tag": "forge:ingots/gold" + } }, - "X": { - "tag": "forge:ingots/gold" - } - }, - "result": { - "item": "basemetals:gold_gear", - "count": 4 - }, - "group": "basemetals:gold_gear" + "result": { + "item": "basemetals:gold_gear", + "count": 4 + }, + "group": "basemetals:gold_gear" + } } diff --git a/src/generated/resources/data/basemetals/recipes/gold_lever.json b/src/generated/resources/data/basemetals/recipes/gold_lever.json index 57091aa4..a275d3ba 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_lever.json +++ b/src/generated/resources/data/basemetals/recipes/gold_lever.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "X" - ], - "key": { - "R": { - "tag": "forge:rods/gold" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "X" + ], + "key": { + "R": { + "tag": "forge:rods/gold" + }, + "X": { + "tag": "forge:ingots/gold" + } }, - "X": { - "tag": "forge:ingots/gold" - } - }, - "result": { - "item": "basemetals:gold_lever" - }, - "group": "basemetals:gold_lever" + "result": { + "item": "basemetals:gold_lever" + }, + "group": "basemetals:gold_lever" + } } diff --git a/src/generated/resources/data/basemetals/recipes/gold_plate.json b/src/generated/resources/data/basemetals/recipes/gold_plate.json index 0c45e439..8adf187c 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_plate.json +++ b/src/generated/resources/data/basemetals/recipes/gold_plate.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/gold" - } - }, - "result": { - "item": "basemetals:gold_plate", - "count": 3 - }, - "group": "basemetals:gold_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/gold" + } + }, + "result": { + "item": "basemetals:gold_plate", + "count": 3 + }, + "group": "basemetals:gold_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/gold_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/gold_powder_from_small.json index 44108d7b..01b35954 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/gold_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/gold" - } - }, - "result": { - "item": "basemetals:gold_powder" - }, - "group": "basemetals:gold_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/gold" + } + }, + "result": { + "item": "basemetals:gold_powder" + }, + "group": "basemetals:gold_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/gold_rod.json b/src/generated/resources/data/basemetals/recipes/gold_rod.json index 0cbe14c0..2f64a6c1 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_rod.json +++ b/src/generated/resources/data/basemetals/recipes/gold_rod.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:ingots/gold" - } - }, - "result": { - "item": "basemetals:gold_rod", - "count": 4 - }, - "group": "basemetals:gold_rod" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:ingots/gold" + } + }, + "result": { + "item": "basemetals:gold_rod", + "count": 4 + }, + "group": "basemetals:gold_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/gold_scythe.json b/src/generated/resources/data/basemetals/recipes/gold_scythe.json index 29955cd9..4282fa38 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/gold_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/gold" + } }, - "X": { - "tag": "forge:ingots/gold" - } - }, - "result": { - "item": "basemetals:gold_scythe" - }, - "group": "basemetals:gold_scythe" + "result": { + "item": "basemetals:gold_scythe" + }, + "group": "basemetals:gold_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/gold_shears.json b/src/generated/resources/data/basemetals/recipes/gold_shears.json index adced59e..a6491403 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_shears.json +++ b/src/generated/resources/data/basemetals/recipes/gold_shears.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "X " - ], - "key": { - "X": { - "tag": "forge:ingots/gold" - } - }, - "result": { - "item": "basemetals:gold_shears" - }, - "group": "basemetals:gold_shears" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "X " + ], + "key": { + "X": { + "tag": "forge:ingots/gold" + } + }, + "result": { + "item": "basemetals:gold_shears" + }, + "group": "basemetals:gold_shears" + } } diff --git a/src/generated/resources/data/basemetals/recipes/gold_shield.json b/src/generated/resources/data/basemetals/recipes/gold_shield.json index 00b8093f..9cf76ac5 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_shield.json +++ b/src/generated/resources/data/basemetals/recipes/gold_shield.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XWX", - "XXX", - " X " - ], - "key": { - "W": { - "tag": "minecraft:planks" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XWX", + "XXX", + " X " + ], + "key": { + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:ingots/gold" + } }, - "X": { - "tag": "forge:ingots/gold" - } - }, - "result": { - "item": "basemetals:gold_shield" - }, - "group": "basemetals:gold_shield" + "result": { + "item": "basemetals:gold_shield" + }, + "group": "basemetals:gold_shield" + } } diff --git a/src/generated/resources/data/basemetals/recipes/gold_slab.json b/src/generated/resources/data/basemetals/recipes/gold_slab.json index 5acca4df..5804a529 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_slab.json +++ b/src/generated/resources/data/basemetals/recipes/gold_slab.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/gold" - } - }, - "result": { - "item": "basemetals:gold_slab", - "count": 6 - }, - "group": "basemetals:gold_slab" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/gold" + } + }, + "result": { + "item": "basemetals:gold_slab", + "count": 6 + }, + "group": "basemetals:gold_slab" + } } diff --git a/src/generated/resources/data/basemetals/recipes/gold_smallpowder.json b/src/generated/resources/data/basemetals/recipes/gold_smallpowder.json index 41390c34..475e9b56 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/gold_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/gold" - } - ], - "result": { - "item": "basemetals:gold_smallpowder", - "count": 9 - }, - "group": "basemetals:gold_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/gold" + } + ], + "result": { + "item": "basemetals:gold_smallpowder", + "count": 9 + }, + "group": "basemetals:gold_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/gold_stairs.json b/src/generated/resources/data/basemetals/recipes/gold_stairs.json index 5293b733..c9a1f026 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/gold_stairs.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X ", - "XX ", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/gold" - } - }, - "result": { - "item": "basemetals:gold_stairs", - "count": 4 - }, - "group": "basemetals:gold_stairs" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/gold" + } + }, + "result": { + "item": "basemetals:gold_stairs", + "count": 4 + }, + "group": "basemetals:gold_stairs" + } } diff --git a/src/generated/resources/data/basemetals/recipes/gold_trapdoor.json b/src/generated/resources/data/basemetals/recipes/gold_trapdoor.json index c0eada44..c9350314 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/gold_trapdoor.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/gold" - } - }, - "result": { - "item": "basemetals:gold_trapdoor" - }, - "group": "basemetals:gold_trapdoor" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/gold" + } + }, + "result": { + "item": "basemetals:gold_trapdoor" + }, + "group": "basemetals:gold_trapdoor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/gold_wall.json b/src/generated/resources/data/basemetals/recipes/gold_wall.json index d5e102cc..e78f4d06 100644 --- a/src/generated/resources/data/basemetals/recipes/gold_wall.json +++ b/src/generated/resources/data/basemetals/recipes/gold_wall.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/gold" - } - }, - "result": { - "item": "basemetals:gold_wall", - "count": 6 - }, - "group": "basemetals:gold_wall" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/gold" + } + }, + "result": { + "item": "basemetals:gold_wall", + "count": 6 + }, + "group": "basemetals:gold_wall" + } } diff --git a/src/generated/resources/data/basemetals/recipes/human_detector.json b/src/generated/resources/data/basemetals/recipes/human_detector.json index efaae9b3..44a9af0e 100644 --- a/src/generated/resources/data/basemetals/recipes/human_detector.json +++ b/src/generated/resources/data/basemetals/recipes/human_detector.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "GG" - ], - "key": { - "G": { - "tag": "forge:gears" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "GG" + ], + "key": { + "G": { + "tag": "forge:gears" + }, + "X": { + "item": "minecraft:brick" + } }, - "X": { - "item": "minecraft:brick" - } - }, - "result": { - "item": "basemetals:human_detector" - }, - "group": "basemetals:human_detector" + "result": { + "item": "basemetals:human_detector" + }, + "group": "basemetals:human_detector" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_arrow.json b/src/generated/resources/data/basemetals/recipes/invar_arrow.json index b31bc84b..cb57fbeb 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/invar_arrow.json @@ -1,24 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "N", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "N", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "N": { + "tag": "forge:nuggets/invar" + }, + "R": { + "tag": "forge:rods/invar" + } }, - "N": { - "tag": "forge:nuggets/invar" + "result": { + "item": "basemetals:invar_arrow", + "count": 4 }, - "R": { - "tag": "forge:rods/invar" - } - }, - "result": { - "item": "basemetals:invar_arrow", - "count": 4 - }, - "group": "basemetals:invar_arrow" + "group": "basemetals:invar_arrow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_axe.json b/src/generated/resources/data/basemetals/recipes/invar_axe.json index 2a9b0f81..254c820d 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_axe.json +++ b/src/generated/resources/data/basemetals/recipes/invar_axe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XS", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XS", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/invar" + } }, - "X": { - "tag": "forge:ingots/invar" - } - }, - "result": { - "item": "basemetals:invar_axe" - }, - "group": "basemetals:invar_axe" + "result": { + "item": "basemetals:invar_axe" + }, + "group": "basemetals:invar_axe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_bars.json b/src/generated/resources/data/basemetals/recipes/invar_bars.json index 40324325..69ceb23f 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_bars.json +++ b/src/generated/resources/data/basemetals/recipes/invar_bars.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/invar" - } - }, - "result": { - "item": "basemetals:invar_bars", - "count": 16 - }, - "group": "basemetals:invar_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/invar" + } + }, + "result": { + "item": "basemetals:invar_bars", + "count": 16 + }, + "group": "basemetals:invar_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_bars_2.json b/src/generated/resources/data/basemetals/recipes/invar_bars_2.json index 0762f962..3e8b9dc8 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/invar_bars_2.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:rods/invar" - } - }, - "result": { - "item": "basemetals:invar_bars", - "count": 4 - }, - "group": "basemetals:invar_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:rods/invar" + } + }, + "result": { + "item": "basemetals:invar_bars", + "count": 4 + }, + "group": "basemetals:invar_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_blend.json b/src/generated/resources/data/basemetals/recipes/invar_blend.json index cb8d41e7..9d048732 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_blend.json +++ b/src/generated/resources/data/basemetals/recipes/invar_blend.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/iron" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/iron" + }, + { + "tag": "forge:dusts/iron" + }, + { + "tag": "forge:dusts/nickel" + } + ], + "result": { + "item": "basemetals:invar_blend", + "count": 3 }, - { - "tag": "forge:dusts/iron" - }, - { - "tag": "forge:dusts/nickel" - } - ], - "result": { - "item": "basemetals:invar_blend", - "count": 3 - }, - "group": "basemetals:invar_blend" + "group": "basemetals:invar_blend" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_blend_from_small.json b/src/generated/resources/data/basemetals/recipes/invar_blend_from_small.json index b77b2467..9425bc86 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_blend_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/invar_blend_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:small_blends/invar" - } - }, - "result": { - "item": "basemetals:invar_blend" - }, - "group": "basemetals:invar_blend" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:small_blends/invar" + } + }, + "result": { + "item": "basemetals:invar_blend" + }, + "group": "basemetals:invar_blend" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_block.json b/src/generated/resources/data/basemetals/recipes/invar_block.json index b2e704f1..164445b6 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_block.json +++ b/src/generated/resources/data/basemetals/recipes/invar_block.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/invar" - } - }, - "result": { - "item": "basemetals:invar_block" - }, - "group": "basemetals:invar_block" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/invar" + } + }, + "result": { + "item": "basemetals:invar_block" + }, + "group": "basemetals:invar_block" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_block_ingot.json b/src/generated/resources/data/basemetals/recipes/invar_block_ingot.json index c5545b9f..6ff39ac8 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/invar_block_ingot.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/invar" - } - ], - "result": { - "item": "basemetals:invar_ingot", - "count": 9 - }, - "group": "basemetals:invar_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/invar" + } + ], + "result": { + "item": "basemetals:invar_ingot", + "count": 9 + }, + "group": "basemetals:invar_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_bolt.json b/src/generated/resources/data/basemetals/recipes/invar_bolt.json index 8d825a2e..199e6db9 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/invar_bolt.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "R": { + "tag": "forge:rods/invar" + } }, - "R": { - "tag": "forge:rods/invar" - } - }, - "result": { - "item": "basemetals:invar_bolt", - "count": 4 - }, - "group": "basemetals:invar_bolt" + "result": { + "item": "basemetals:invar_bolt", + "count": 4 + }, + "group": "basemetals:invar_bolt" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_boots.json b/src/generated/resources/data/basemetals/recipes/invar_boots.json index 64c3189e..10ae9afd 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_boots.json +++ b/src/generated/resources/data/basemetals/recipes/invar_boots.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/invar" - } - }, - "result": { - "item": "basemetals:invar_boots" - }, - "group": "basemetals:invar_boots" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/invar" + } + }, + "result": { + "item": "basemetals:invar_boots" + }, + "group": "basemetals:invar_boots" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_bow.json b/src/generated/resources/data/basemetals/recipes/invar_bow.json index c6ba1f00..2b149f34 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_bow.json +++ b/src/generated/resources/data/basemetals/recipes/invar_bow.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " RS", - "R S", - " RS" - ], - "key": { - "R": { - "tag": "forge:rods/invar" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " RS", + "R S", + " RS" + ], + "key": { + "R": { + "tag": "forge:rods/invar" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:invar_bow" - }, - "group": "basemetals:invar_bow" + "result": { + "item": "basemetals:invar_bow" + }, + "group": "basemetals:invar_bow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_button.json b/src/generated/resources/data/basemetals/recipes/invar_button.json index 8474917b..5747eca8 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_button.json +++ b/src/generated/resources/data/basemetals/recipes/invar_button.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:nuggets/invar" - } - }, - "result": { - "item": "basemetals:invar_button" - }, - "group": "basemetals:invar_button" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:nuggets/invar" + } + }, + "result": { + "item": "basemetals:invar_button" + }, + "group": "basemetals:invar_button" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_chestplate.json b/src/generated/resources/data/basemetals/recipes/invar_chestplate.json index 9f18b684..2b9443b3 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/invar_chestplate.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/invar" - } - }, - "result": { - "item": "basemetals:invar_chestplate" - }, - "group": "basemetals:invar_chestplate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/invar" + } + }, + "result": { + "item": "basemetals:invar_chestplate" + }, + "group": "basemetals:invar_chestplate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_crackhammer.json b/src/generated/resources/data/basemetals/recipes/invar_crackhammer.json index 4a01c375..996f7cad 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/invar_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:storage_blocks/invar" + } }, - "X": { - "tag": "forge:storage_blocks/invar" - } - }, - "result": { - "item": "basemetals:invar_crackhammer" - }, - "group": "basemetals:invar_crackhammer" + "result": { + "item": "basemetals:invar_crackhammer" + }, + "group": "basemetals:invar_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_crossbow.json b/src/generated/resources/data/basemetals/recipes/invar_crossbow.json index 320f45b5..185c629b 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/invar_crossbow.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRR", - " SR", - "R G" - ], - "key": { - "G": { - "tag": "forge:gears/invar" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRR", + " SR", + "R G" + ], + "key": { + "G": { + "tag": "forge:gears/invar" + }, + "R": { + "tag": "forge:rods/invar" + }, + "S": { + "item": "minecraft:string" + } }, - "R": { - "tag": "forge:rods/invar" + "result": { + "item": "basemetals:invar_crossbow" }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:invar_crossbow" - }, - "group": "basemetals:invar_crossbow" + "group": "basemetals:invar_crossbow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_door.json b/src/generated/resources/data/basemetals/recipes/invar_door.json index 673b730e..e161e3c8 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_door.json +++ b/src/generated/resources/data/basemetals/recipes/invar_door.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/invar" - } - }, - "result": { - "item": "basemetals:invar_door", - "count": 3 - }, - "group": "basemetals:invar_door" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/invar" + } + }, + "result": { + "item": "basemetals:invar_door", + "count": 3 + }, + "group": "basemetals:invar_door" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_fishingrod.json b/src/generated/resources/data/basemetals/recipes/invar_fishingrod.json index 68392ad2..19dfa00b 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/invar_fishingrod.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " R", - " RS", - "R S" - ], - "key": { - "R": { - "tag": "forge:rods/invar" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " R", + " RS", + "R S" + ], + "key": { + "R": { + "tag": "forge:rods/invar" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:invar_fishing_rod" - }, - "group": "basemetals:invar_fishing_rod" + "result": { + "item": "basemetals:invar_fishing_rod" + }, + "group": "basemetals:invar_fishing_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_gear.json b/src/generated/resources/data/basemetals/recipes/invar_gear.json index 9d064ee6..5f4228b5 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_gear.json +++ b/src/generated/resources/data/basemetals/recipes/invar_gear.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "XRX", - " X " - ], - "key": { - "R": { - "tag": "forge:rods/invar" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XRX", + " X " + ], + "key": { + "R": { + "tag": "forge:rods/invar" + }, + "X": { + "tag": "forge:ingots/invar" + } }, - "X": { - "tag": "forge:ingots/invar" - } - }, - "result": { - "item": "basemetals:invar_gear", - "count": 4 - }, - "group": "basemetals:invar_gear" + "result": { + "item": "basemetals:invar_gear", + "count": 4 + }, + "group": "basemetals:invar_gear" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_helmet.json b/src/generated/resources/data/basemetals/recipes/invar_helmet.json index adc07b9f..858f69b0 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/invar_helmet.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/invar" - } - }, - "result": { - "item": "basemetals:invar_helmet" - }, - "group": "basemetals:invar_helmet" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/invar" + } + }, + "result": { + "item": "basemetals:invar_helmet" + }, + "group": "basemetals:invar_helmet" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_hoe.json b/src/generated/resources/data/basemetals/recipes/invar_hoe.json index e49731dc..6c292baf 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/invar_hoe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - " S", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " S", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/invar" + } }, - "X": { - "tag": "forge:ingots/invar" - } - }, - "result": { - "item": "basemetals:invar_hoe" - }, - "group": "basemetals:invar_hoe" + "result": { + "item": "basemetals:invar_hoe" + }, + "group": "basemetals:invar_hoe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_horsearmor.json b/src/generated/resources/data/basemetals/recipes/invar_horsearmor.json index a1d00faf..d896879d 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/invar_horsearmor.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "XWX", - "XXX" - ], - "key": { - "W": { - "tag": "minecraft:wool" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "XWX", + "XXX" + ], + "key": { + "W": { + "tag": "minecraft:wool" + }, + "X": { + "tag": "forge:ingots/invar" + } }, - "X": { - "tag": "forge:ingots/invar" - } - }, - "result": { - "item": "basemetals:invar_horse_armor" - }, - "group": "basemetals:invar_horse_armor" + "result": { + "item": "basemetals:invar_horse_armor" + }, + "group": "basemetals:invar_horse_armor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/invar_ingot_from_nuggets.json index fdd4dacf..521a5aed 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/invar_ingot_from_nuggets.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:nuggets/invar" - } - }, - "result": { - "item": "basemetals:invar_ingot" - }, - "group": "basemetals:invar_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:nuggets/invar" + } + }, + "result": { + "item": "basemetals:invar_ingot" + }, + "group": "basemetals:invar_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_leggings.json b/src/generated/resources/data/basemetals/recipes/invar_leggings.json index 2f7b6afe..508ea239 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/invar_leggings.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/invar" - } - }, - "result": { - "item": "basemetals:invar_leggings" - }, - "group": "basemetals:invar_leggings" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/invar" + } + }, + "result": { + "item": "basemetals:invar_leggings" + }, + "group": "basemetals:invar_leggings" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_lever.json b/src/generated/resources/data/basemetals/recipes/invar_lever.json index 2c24a11d..d29c3c27 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_lever.json +++ b/src/generated/resources/data/basemetals/recipes/invar_lever.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "X" - ], - "key": { - "R": { - "tag": "forge:rods/invar" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "X" + ], + "key": { + "R": { + "tag": "forge:rods/invar" + }, + "X": { + "tag": "forge:ingots/invar" + } }, - "X": { - "tag": "forge:ingots/invar" - } - }, - "result": { - "item": "basemetals:invar_lever" - }, - "group": "basemetals:invar_lever" + "result": { + "item": "basemetals:invar_lever" + }, + "group": "basemetals:invar_lever" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_nuggets.json b/src/generated/resources/data/basemetals/recipes/invar_nuggets.json index d337b3b1..b14bc397 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/invar_nuggets.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:ingots/invar" - } - ], - "result": { - "item": "basemetals:invar_nugget", - "count": 9 - }, - "group": "basemetals:invar_nugget" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/invar" + } + ], + "result": { + "item": "basemetals:invar_nugget", + "count": 9 + }, + "group": "basemetals:invar_nugget" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_pickaxe.json b/src/generated/resources/data/basemetals/recipes/invar_pickaxe.json index 7ba3927d..703470b3 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/invar_pickaxe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " S ", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " S ", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/invar" + } }, - "X": { - "tag": "forge:ingots/invar" - } - }, - "result": { - "item": "basemetals:invar_pickaxe" - }, - "group": "basemetals:invar_pickaxe" + "result": { + "item": "basemetals:invar_pickaxe" + }, + "group": "basemetals:invar_pickaxe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_plate.json b/src/generated/resources/data/basemetals/recipes/invar_plate.json index d906d84c..588a1e2d 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_plate.json +++ b/src/generated/resources/data/basemetals/recipes/invar_plate.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/invar" - } - }, - "result": { - "item": "basemetals:invar_plate", - "count": 3 - }, - "group": "basemetals:invar_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/invar" + } + }, + "result": { + "item": "basemetals:invar_plate", + "count": 3 + }, + "group": "basemetals:invar_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/invar_powder_from_small.json index 305d9ff5..d9cb87d9 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/invar_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/invar" - } - }, - "result": { - "item": "basemetals:invar_powder" - }, - "group": "basemetals:invar_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/invar" + } + }, + "result": { + "item": "basemetals:invar_powder" + }, + "group": "basemetals:invar_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/invar_pressure_plate.json index d6de69c0..3c730ef3 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/invar_pressure_plate.json @@ -1,15 +1,18 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/invar" - } - }, - "result": { - "item": "basemetals:invar_pressure_plate" - }, - "group": "basemetals:invar_pressure_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/invar" + } + }, + "result": { + "item": "basemetals:invar_pressure_plate" + }, + "group": "basemetals:invar_pressure_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_rod.json b/src/generated/resources/data/basemetals/recipes/invar_rod.json index ba4dab96..e70366cb 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_rod.json +++ b/src/generated/resources/data/basemetals/recipes/invar_rod.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:ingots/invar" - } - }, - "result": { - "item": "basemetals:invar_rod", - "count": 4 - }, - "group": "basemetals:invar_rod" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:ingots/invar" + } + }, + "result": { + "item": "basemetals:invar_rod", + "count": 4 + }, + "group": "basemetals:invar_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_scythe.json b/src/generated/resources/data/basemetals/recipes/invar_scythe.json index 27e49e47..78630696 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/invar_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/invar" + } }, - "X": { - "tag": "forge:ingots/invar" - } - }, - "result": { - "item": "basemetals:invar_scythe" - }, - "group": "basemetals:invar_scythe" + "result": { + "item": "basemetals:invar_scythe" + }, + "group": "basemetals:invar_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_shears.json b/src/generated/resources/data/basemetals/recipes/invar_shears.json index fca83877..19ae1d1e 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_shears.json +++ b/src/generated/resources/data/basemetals/recipes/invar_shears.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "X " - ], - "key": { - "X": { - "tag": "forge:ingots/invar" - } - }, - "result": { - "item": "basemetals:invar_shears" - }, - "group": "basemetals:invar_shears" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "X " + ], + "key": { + "X": { + "tag": "forge:ingots/invar" + } + }, + "result": { + "item": "basemetals:invar_shears" + }, + "group": "basemetals:invar_shears" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_shield.json b/src/generated/resources/data/basemetals/recipes/invar_shield.json index 72f9a3ba..e370e188 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_shield.json +++ b/src/generated/resources/data/basemetals/recipes/invar_shield.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XWX", - "XXX", - " X " - ], - "key": { - "W": { - "tag": "minecraft:planks" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XWX", + "XXX", + " X " + ], + "key": { + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:ingots/invar" + } }, - "X": { - "tag": "forge:ingots/invar" - } - }, - "result": { - "item": "basemetals:invar_shield" - }, - "group": "basemetals:invar_shield" + "result": { + "item": "basemetals:invar_shield" + }, + "group": "basemetals:invar_shield" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_shovel.json b/src/generated/resources/data/basemetals/recipes/invar_shovel.json index 08aa23ee..4dbee5b7 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/invar_shovel.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/invar" + } }, - "X": { - "tag": "forge:ingots/invar" - } - }, - "result": { - "item": "basemetals:invar_shovel" - }, - "group": "basemetals:invar_shovel" + "result": { + "item": "basemetals:invar_shovel" + }, + "group": "basemetals:invar_shovel" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_slab.json b/src/generated/resources/data/basemetals/recipes/invar_slab.json index ed43e3b9..649e30fd 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_slab.json +++ b/src/generated/resources/data/basemetals/recipes/invar_slab.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/invar" - } - }, - "result": { - "item": "basemetals:invar_slab", - "count": 6 - }, - "group": "basemetals:invar_slab" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/invar" + } + }, + "result": { + "item": "basemetals:invar_slab", + "count": 6 + }, + "group": "basemetals:invar_slab" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_smallblend.json b/src/generated/resources/data/basemetals/recipes/invar_smallblend.json index dbd91ac1..0899b334 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_smallblend.json +++ b/src/generated/resources/data/basemetals/recipes/invar_smallblend.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:blends/invar" - } - ], - "result": { - "item": "basemetals:invar_smallblend", - "count": 9 - }, - "group": "basemetals:invar_smallblend" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:blends/invar" + } + ], + "result": { + "item": "basemetals:invar_smallblend", + "count": 9 + }, + "group": "basemetals:invar_smallblend" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_smallpowder.json b/src/generated/resources/data/basemetals/recipes/invar_smallpowder.json index 67cc70a3..c5ec2a2f 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/invar_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/invar" - } - ], - "result": { - "item": "basemetals:invar_smallpowder", - "count": 9 - }, - "group": "basemetals:invar_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/invar" + } + ], + "result": { + "item": "basemetals:invar_smallpowder", + "count": 9 + }, + "group": "basemetals:invar_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_stairs.json b/src/generated/resources/data/basemetals/recipes/invar_stairs.json index 79d1aab9..5a28ec46 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/invar_stairs.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X ", - "XX ", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/invar" - } - }, - "result": { - "item": "basemetals:invar_stairs", - "count": 4 - }, - "group": "basemetals:invar_stairs" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/invar" + } + }, + "result": { + "item": "basemetals:invar_stairs", + "count": 4 + }, + "group": "basemetals:invar_stairs" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_sword.json b/src/generated/resources/data/basemetals/recipes/invar_sword.json index eb72d915..5d2847a4 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_sword.json +++ b/src/generated/resources/data/basemetals/recipes/invar_sword.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/invar" + } }, - "X": { - "tag": "forge:ingots/invar" - } - }, - "result": { - "item": "basemetals:invar_sword" - }, - "group": "basemetals:invar_sword" + "result": { + "item": "basemetals:invar_sword" + }, + "group": "basemetals:invar_sword" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_trapdoor.json b/src/generated/resources/data/basemetals/recipes/invar_trapdoor.json index ef28e06f..f1804170 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/invar_trapdoor.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/invar" - } - }, - "result": { - "item": "basemetals:invar_trapdoor" - }, - "group": "basemetals:invar_trapdoor" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/invar" + } + }, + "result": { + "item": "basemetals:invar_trapdoor" + }, + "group": "basemetals:invar_trapdoor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/invar_wall.json b/src/generated/resources/data/basemetals/recipes/invar_wall.json index 5e3400da..9fad4315 100644 --- a/src/generated/resources/data/basemetals/recipes/invar_wall.json +++ b/src/generated/resources/data/basemetals/recipes/invar_wall.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/invar" - } - }, - "result": { - "item": "basemetals:invar_wall", - "count": 6 - }, - "group": "basemetals:invar_wall" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/invar" + } + }, + "result": { + "item": "basemetals:invar_wall", + "count": 6 + }, + "group": "basemetals:invar_wall" + } } diff --git a/src/generated/resources/data/basemetals/recipes/iron_arrow.json b/src/generated/resources/data/basemetals/recipes/iron_arrow.json index e1e5e7e9..ba1f59a4 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/iron_arrow.json @@ -1,24 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "N", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "N", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "N": { + "tag": "forge:nuggets/iron" + }, + "R": { + "tag": "forge:rods/iron" + } }, - "N": { - "tag": "forge:nuggets/iron" + "result": { + "item": "basemetals:iron_arrow", + "count": 4 }, - "R": { - "tag": "forge:rods/iron" - } - }, - "result": { - "item": "basemetals:iron_arrow", - "count": 4 - }, - "group": "basemetals:iron_arrow" + "group": "basemetals:iron_arrow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/iron_bars_2.json b/src/generated/resources/data/basemetals/recipes/iron_bars_2.json index 22a77c26..74461d9c 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/iron_bars_2.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:rods/iron" - } - }, - "result": { - "item": "minecraft:iron_bars", - "count": 4 - }, - "group": "minecraft:iron_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:rods/iron" + } + }, + "result": { + "item": "minecraft:iron_bars", + "count": 4 + }, + "group": "minecraft:iron_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/iron_bolt.json b/src/generated/resources/data/basemetals/recipes/iron_bolt.json index fd851ba7..8c42d10a 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/iron_bolt.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "R": { + "tag": "forge:rods/iron" + } }, - "R": { - "tag": "forge:rods/iron" - } - }, - "result": { - "item": "basemetals:iron_bolt", - "count": 4 - }, - "group": "basemetals:iron_bolt" + "result": { + "item": "basemetals:iron_bolt", + "count": 4 + }, + "group": "basemetals:iron_bolt" + } } diff --git a/src/generated/resources/data/basemetals/recipes/iron_bow.json b/src/generated/resources/data/basemetals/recipes/iron_bow.json index d8a3832a..28db1c58 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_bow.json +++ b/src/generated/resources/data/basemetals/recipes/iron_bow.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " RS", - "R S", - " RS" - ], - "key": { - "R": { - "tag": "forge:rods/iron" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " RS", + "R S", + " RS" + ], + "key": { + "R": { + "tag": "forge:rods/iron" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:iron_bow" - }, - "group": "basemetals:iron_bow" + "result": { + "item": "basemetals:iron_bow" + }, + "group": "basemetals:iron_bow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/iron_button.json b/src/generated/resources/data/basemetals/recipes/iron_button.json index 9e6f8390..8627a214 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_button.json +++ b/src/generated/resources/data/basemetals/recipes/iron_button.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:nuggets/iron" - } - }, - "result": { - "item": "basemetals:iron_button" - }, - "group": "basemetals:iron_button" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:nuggets/iron" + } + }, + "result": { + "item": "basemetals:iron_button" + }, + "group": "basemetals:iron_button" + } } diff --git a/src/generated/resources/data/basemetals/recipes/iron_crackhammer.json b/src/generated/resources/data/basemetals/recipes/iron_crackhammer.json index 0d5aa7e9..258e68e7 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/iron_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:storage_blocks/iron" + } }, - "X": { - "tag": "forge:storage_blocks/iron" - } - }, - "result": { - "item": "basemetals:iron_crackhammer" - }, - "group": "basemetals:iron_crackhammer" + "result": { + "item": "basemetals:iron_crackhammer" + }, + "group": "basemetals:iron_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/iron_crossbow.json b/src/generated/resources/data/basemetals/recipes/iron_crossbow.json index 3c54923d..bef66dfc 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/iron_crossbow.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRR", - " SR", - "R G" - ], - "key": { - "G": { - "tag": "forge:gears/iron" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRR", + " SR", + "R G" + ], + "key": { + "G": { + "tag": "forge:gears/iron" + }, + "R": { + "tag": "forge:rods/iron" + }, + "S": { + "item": "minecraft:string" + } }, - "R": { - "tag": "forge:rods/iron" + "result": { + "item": "basemetals:iron_crossbow" }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:iron_crossbow" - }, - "group": "basemetals:iron_crossbow" + "group": "basemetals:iron_crossbow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/iron_fishingrod.json b/src/generated/resources/data/basemetals/recipes/iron_fishingrod.json index 7ce41eba..fb26f561 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/iron_fishingrod.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " R", - " RS", - "R S" - ], - "key": { - "R": { - "tag": "forge:rods/iron" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " R", + " RS", + "R S" + ], + "key": { + "R": { + "tag": "forge:rods/iron" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:iron_fishing_rod" - }, - "group": "basemetals:iron_fishing_rod" + "result": { + "item": "basemetals:iron_fishing_rod" + }, + "group": "basemetals:iron_fishing_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/iron_gear.json b/src/generated/resources/data/basemetals/recipes/iron_gear.json index 168f41d2..c7cf39e4 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_gear.json +++ b/src/generated/resources/data/basemetals/recipes/iron_gear.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "XRX", - " X " - ], - "key": { - "R": { - "tag": "forge:rods/iron" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XRX", + " X " + ], + "key": { + "R": { + "tag": "forge:rods/iron" + }, + "X": { + "tag": "forge:ingots/iron" + } }, - "X": { - "tag": "forge:ingots/iron" - } - }, - "result": { - "item": "basemetals:iron_gear", - "count": 4 - }, - "group": "basemetals:iron_gear" + "result": { + "item": "basemetals:iron_gear", + "count": 4 + }, + "group": "basemetals:iron_gear" + } } diff --git a/src/generated/resources/data/basemetals/recipes/iron_lever.json b/src/generated/resources/data/basemetals/recipes/iron_lever.json index bb3bd4bf..c32576e5 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_lever.json +++ b/src/generated/resources/data/basemetals/recipes/iron_lever.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "X" - ], - "key": { - "R": { - "tag": "forge:rods/iron" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "X" + ], + "key": { + "R": { + "tag": "forge:rods/iron" + }, + "X": { + "tag": "forge:ingots/iron" + } }, - "X": { - "tag": "forge:ingots/iron" - } - }, - "result": { - "item": "basemetals:iron_lever" - }, - "group": "basemetals:iron_lever" + "result": { + "item": "basemetals:iron_lever" + }, + "group": "basemetals:iron_lever" + } } diff --git a/src/generated/resources/data/basemetals/recipes/iron_plate.json b/src/generated/resources/data/basemetals/recipes/iron_plate.json index 7d3bdeac..4ee736a5 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_plate.json +++ b/src/generated/resources/data/basemetals/recipes/iron_plate.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/iron" - } - }, - "result": { - "item": "basemetals:iron_plate", - "count": 3 - }, - "group": "basemetals:iron_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/iron" + } + }, + "result": { + "item": "basemetals:iron_plate", + "count": 3 + }, + "group": "basemetals:iron_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/iron_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/iron_powder_from_small.json index dc00ec96..42c8b23d 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/iron_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/iron" - } - }, - "result": { - "item": "basemetals:iron_powder" - }, - "group": "basemetals:iron_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/iron" + } + }, + "result": { + "item": "basemetals:iron_powder" + }, + "group": "basemetals:iron_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/iron_rod.json b/src/generated/resources/data/basemetals/recipes/iron_rod.json index 011c9b1c..30c40aa9 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_rod.json +++ b/src/generated/resources/data/basemetals/recipes/iron_rod.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:ingots/iron" - } - }, - "result": { - "item": "basemetals:iron_rod", - "count": 4 - }, - "group": "basemetals:iron_rod" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:ingots/iron" + } + }, + "result": { + "item": "basemetals:iron_rod", + "count": 4 + }, + "group": "basemetals:iron_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/iron_scythe.json b/src/generated/resources/data/basemetals/recipes/iron_scythe.json index 3eb55f46..6c8f5594 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/iron_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/iron" + } }, - "X": { - "tag": "forge:ingots/iron" - } - }, - "result": { - "item": "basemetals:iron_scythe" - }, - "group": "basemetals:iron_scythe" + "result": { + "item": "basemetals:iron_scythe" + }, + "group": "basemetals:iron_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/iron_shield.json b/src/generated/resources/data/basemetals/recipes/iron_shield.json index fbeefa76..7e914329 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_shield.json +++ b/src/generated/resources/data/basemetals/recipes/iron_shield.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XWX", - "XXX", - " X " - ], - "key": { - "W": { - "tag": "minecraft:planks" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XWX", + "XXX", + " X " + ], + "key": { + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:ingots/iron" + } }, - "X": { - "tag": "forge:ingots/iron" - } - }, - "result": { - "item": "basemetals:iron_shield" - }, - "group": "basemetals:iron_shield" + "result": { + "item": "basemetals:iron_shield" + }, + "group": "basemetals:iron_shield" + } } diff --git a/src/generated/resources/data/basemetals/recipes/iron_slab.json b/src/generated/resources/data/basemetals/recipes/iron_slab.json index 5c92d342..cec7374e 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_slab.json +++ b/src/generated/resources/data/basemetals/recipes/iron_slab.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/iron" - } - }, - "result": { - "item": "basemetals:iron_slab", - "count": 6 - }, - "group": "basemetals:iron_slab" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/iron" + } + }, + "result": { + "item": "basemetals:iron_slab", + "count": 6 + }, + "group": "basemetals:iron_slab" + } } diff --git a/src/generated/resources/data/basemetals/recipes/iron_smallpowder.json b/src/generated/resources/data/basemetals/recipes/iron_smallpowder.json index f0897930..261a5d7e 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/iron_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/iron" - } - ], - "result": { - "item": "basemetals:iron_smallpowder", - "count": 9 - }, - "group": "basemetals:iron_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/iron" + } + ], + "result": { + "item": "basemetals:iron_smallpowder", + "count": 9 + }, + "group": "basemetals:iron_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/iron_stairs.json b/src/generated/resources/data/basemetals/recipes/iron_stairs.json index a1db7638..5d9a2379 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/iron_stairs.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X ", - "XX ", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/iron" - } - }, - "result": { - "item": "basemetals:iron_stairs", - "count": 4 - }, - "group": "basemetals:iron_stairs" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/iron" + } + }, + "result": { + "item": "basemetals:iron_stairs", + "count": 4 + }, + "group": "basemetals:iron_stairs" + } } diff --git a/src/generated/resources/data/basemetals/recipes/iron_wall.json b/src/generated/resources/data/basemetals/recipes/iron_wall.json index 5bfb2800..e32ebc2d 100644 --- a/src/generated/resources/data/basemetals/recipes/iron_wall.json +++ b/src/generated/resources/data/basemetals/recipes/iron_wall.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/iron" - } - }, - "result": { - "item": "basemetals:iron_wall", - "count": 6 - }, - "group": "basemetals:iron_wall" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/iron" + } + }, + "result": { + "item": "basemetals:iron_wall", + "count": 6 + }, + "group": "basemetals:iron_wall" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_arrow.json b/src/generated/resources/data/basemetals/recipes/lead_arrow.json index 7417c63c..0e968a58 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/lead_arrow.json @@ -1,24 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "N", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "N", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "N": { + "tag": "forge:nuggets/lead" + }, + "R": { + "tag": "forge:rods/lead" + } }, - "N": { - "tag": "forge:nuggets/lead" + "result": { + "item": "basemetals:lead_arrow", + "count": 4 }, - "R": { - "tag": "forge:rods/lead" - } - }, - "result": { - "item": "basemetals:lead_arrow", - "count": 4 - }, - "group": "basemetals:lead_arrow" + "group": "basemetals:lead_arrow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_axe.json b/src/generated/resources/data/basemetals/recipes/lead_axe.json index 837b965c..e933462d 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_axe.json +++ b/src/generated/resources/data/basemetals/recipes/lead_axe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XS", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XS", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/lead" + } }, - "X": { - "tag": "forge:ingots/lead" - } - }, - "result": { - "item": "basemetals:lead_axe" - }, - "group": "basemetals:lead_axe" + "result": { + "item": "basemetals:lead_axe" + }, + "group": "basemetals:lead_axe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_bars.json b/src/generated/resources/data/basemetals/recipes/lead_bars.json index e62f5ee5..c2085e84 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_bars.json +++ b/src/generated/resources/data/basemetals/recipes/lead_bars.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/lead" - } - }, - "result": { - "item": "basemetals:lead_bars", - "count": 16 - }, - "group": "basemetals:lead_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/lead" + } + }, + "result": { + "item": "basemetals:lead_bars", + "count": 16 + }, + "group": "basemetals:lead_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_bars_2.json b/src/generated/resources/data/basemetals/recipes/lead_bars_2.json index ff454b70..5b3ca541 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/lead_bars_2.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:rods/lead" - } - }, - "result": { - "item": "basemetals:lead_bars", - "count": 4 - }, - "group": "basemetals:lead_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:rods/lead" + } + }, + "result": { + "item": "basemetals:lead_bars", + "count": 4 + }, + "group": "basemetals:lead_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_block.json b/src/generated/resources/data/basemetals/recipes/lead_block.json index 93831679..03d1f31e 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_block.json +++ b/src/generated/resources/data/basemetals/recipes/lead_block.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/lead" - } - }, - "result": { - "item": "basemetals:lead_block" - }, - "group": "basemetals:lead_block" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/lead" + } + }, + "result": { + "item": "basemetals:lead_block" + }, + "group": "basemetals:lead_block" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_block_ingot.json b/src/generated/resources/data/basemetals/recipes/lead_block_ingot.json index da1e3f05..379d232b 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/lead_block_ingot.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/lead" - } - ], - "result": { - "item": "basemetals:lead_ingot", - "count": 9 - }, - "group": "basemetals:lead_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/lead" + } + ], + "result": { + "item": "basemetals:lead_ingot", + "count": 9 + }, + "group": "basemetals:lead_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_bolt.json b/src/generated/resources/data/basemetals/recipes/lead_bolt.json index 0c95a62d..83341377 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/lead_bolt.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "R": { + "tag": "forge:rods/lead" + } }, - "R": { - "tag": "forge:rods/lead" - } - }, - "result": { - "item": "basemetals:lead_bolt", - "count": 4 - }, - "group": "basemetals:lead_bolt" + "result": { + "item": "basemetals:lead_bolt", + "count": 4 + }, + "group": "basemetals:lead_bolt" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_boots.json b/src/generated/resources/data/basemetals/recipes/lead_boots.json index c0d2c0ff..582ac7c5 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_boots.json +++ b/src/generated/resources/data/basemetals/recipes/lead_boots.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/lead" - } - }, - "result": { - "item": "basemetals:lead_boots" - }, - "group": "basemetals:lead_boots" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/lead" + } + }, + "result": { + "item": "basemetals:lead_boots" + }, + "group": "basemetals:lead_boots" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_bow.json b/src/generated/resources/data/basemetals/recipes/lead_bow.json index 98c2a6b7..bdc15e7d 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_bow.json +++ b/src/generated/resources/data/basemetals/recipes/lead_bow.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " RS", - "R S", - " RS" - ], - "key": { - "R": { - "tag": "forge:rods/lead" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " RS", + "R S", + " RS" + ], + "key": { + "R": { + "tag": "forge:rods/lead" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:lead_bow" - }, - "group": "basemetals:lead_bow" + "result": { + "item": "basemetals:lead_bow" + }, + "group": "basemetals:lead_bow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_button.json b/src/generated/resources/data/basemetals/recipes/lead_button.json index 41fe68f3..bcb0f57e 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_button.json +++ b/src/generated/resources/data/basemetals/recipes/lead_button.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:nuggets/lead" - } - }, - "result": { - "item": "basemetals:lead_button" - }, - "group": "basemetals:lead_button" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:nuggets/lead" + } + }, + "result": { + "item": "basemetals:lead_button" + }, + "group": "basemetals:lead_button" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_chestplate.json b/src/generated/resources/data/basemetals/recipes/lead_chestplate.json index f2d8f478..ae6336e0 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/lead_chestplate.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/lead" - } - }, - "result": { - "item": "basemetals:lead_chestplate" - }, - "group": "basemetals:lead_chestplate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/lead" + } + }, + "result": { + "item": "basemetals:lead_chestplate" + }, + "group": "basemetals:lead_chestplate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_crackhammer.json b/src/generated/resources/data/basemetals/recipes/lead_crackhammer.json index 3166054c..1fcf80f9 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/lead_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:storage_blocks/lead" + } }, - "X": { - "tag": "forge:storage_blocks/lead" - } - }, - "result": { - "item": "basemetals:lead_crackhammer" - }, - "group": "basemetals:lead_crackhammer" + "result": { + "item": "basemetals:lead_crackhammer" + }, + "group": "basemetals:lead_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_crossbow.json b/src/generated/resources/data/basemetals/recipes/lead_crossbow.json index 576b2354..f85df904 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/lead_crossbow.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRR", - " SR", - "R G" - ], - "key": { - "G": { - "tag": "forge:gears/lead" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRR", + " SR", + "R G" + ], + "key": { + "G": { + "tag": "forge:gears/lead" + }, + "R": { + "tag": "forge:rods/lead" + }, + "S": { + "item": "minecraft:string" + } }, - "R": { - "tag": "forge:rods/lead" + "result": { + "item": "basemetals:lead_crossbow" }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:lead_crossbow" - }, - "group": "basemetals:lead_crossbow" + "group": "basemetals:lead_crossbow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_door.json b/src/generated/resources/data/basemetals/recipes/lead_door.json index 198e4930..a32802f7 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_door.json +++ b/src/generated/resources/data/basemetals/recipes/lead_door.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/lead" - } - }, - "result": { - "item": "basemetals:lead_door", - "count": 3 - }, - "group": "basemetals:lead_door" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/lead" + } + }, + "result": { + "item": "basemetals:lead_door", + "count": 3 + }, + "group": "basemetals:lead_door" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_fishingrod.json b/src/generated/resources/data/basemetals/recipes/lead_fishingrod.json index 23de22cc..de2a1dde 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/lead_fishingrod.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " R", - " RS", - "R S" - ], - "key": { - "R": { - "tag": "forge:rods/lead" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " R", + " RS", + "R S" + ], + "key": { + "R": { + "tag": "forge:rods/lead" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:lead_fishing_rod" - }, - "group": "basemetals:lead_fishing_rod" + "result": { + "item": "basemetals:lead_fishing_rod" + }, + "group": "basemetals:lead_fishing_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_gear.json b/src/generated/resources/data/basemetals/recipes/lead_gear.json index 6df2ef76..a9cff39b 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_gear.json +++ b/src/generated/resources/data/basemetals/recipes/lead_gear.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "XRX", - " X " - ], - "key": { - "R": { - "tag": "forge:rods/lead" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XRX", + " X " + ], + "key": { + "R": { + "tag": "forge:rods/lead" + }, + "X": { + "tag": "forge:ingots/lead" + } }, - "X": { - "tag": "forge:ingots/lead" - } - }, - "result": { - "item": "basemetals:lead_gear", - "count": 4 - }, - "group": "basemetals:lead_gear" + "result": { + "item": "basemetals:lead_gear", + "count": 4 + }, + "group": "basemetals:lead_gear" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_helmet.json b/src/generated/resources/data/basemetals/recipes/lead_helmet.json index 7b4fdcd0..c14c9b8f 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/lead_helmet.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/lead" - } - }, - "result": { - "item": "basemetals:lead_helmet" - }, - "group": "basemetals:lead_helmet" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/lead" + } + }, + "result": { + "item": "basemetals:lead_helmet" + }, + "group": "basemetals:lead_helmet" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_hoe.json b/src/generated/resources/data/basemetals/recipes/lead_hoe.json index 444b19cd..cfaa0f15 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/lead_hoe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - " S", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " S", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/lead" + } }, - "X": { - "tag": "forge:ingots/lead" - } - }, - "result": { - "item": "basemetals:lead_hoe" - }, - "group": "basemetals:lead_hoe" + "result": { + "item": "basemetals:lead_hoe" + }, + "group": "basemetals:lead_hoe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_horsearmor.json b/src/generated/resources/data/basemetals/recipes/lead_horsearmor.json index 056b02db..5ab859a5 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/lead_horsearmor.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "XWX", - "XXX" - ], - "key": { - "W": { - "tag": "minecraft:wool" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "XWX", + "XXX" + ], + "key": { + "W": { + "tag": "minecraft:wool" + }, + "X": { + "tag": "forge:ingots/lead" + } }, - "X": { - "tag": "forge:ingots/lead" - } - }, - "result": { - "item": "basemetals:lead_horse_armor" - }, - "group": "basemetals:lead_horse_armor" + "result": { + "item": "basemetals:lead_horse_armor" + }, + "group": "basemetals:lead_horse_armor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/lead_ingot_from_nuggets.json index 001cc0d0..497a5ee8 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/lead_ingot_from_nuggets.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:nuggets/lead" - } - }, - "result": { - "item": "basemetals:lead_ingot" - }, - "group": "basemetals:lead_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:nuggets/lead" + } + }, + "result": { + "item": "basemetals:lead_ingot" + }, + "group": "basemetals:lead_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_leggings.json b/src/generated/resources/data/basemetals/recipes/lead_leggings.json index 983e9015..37c0ee4a 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/lead_leggings.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/lead" - } - }, - "result": { - "item": "basemetals:lead_leggings" - }, - "group": "basemetals:lead_leggings" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/lead" + } + }, + "result": { + "item": "basemetals:lead_leggings" + }, + "group": "basemetals:lead_leggings" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_lever.json b/src/generated/resources/data/basemetals/recipes/lead_lever.json index 2bf5d1f9..ec5570dd 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_lever.json +++ b/src/generated/resources/data/basemetals/recipes/lead_lever.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "X" - ], - "key": { - "R": { - "tag": "forge:rods/lead" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "X" + ], + "key": { + "R": { + "tag": "forge:rods/lead" + }, + "X": { + "tag": "forge:ingots/lead" + } }, - "X": { - "tag": "forge:ingots/lead" - } - }, - "result": { - "item": "basemetals:lead_lever" - }, - "group": "basemetals:lead_lever" + "result": { + "item": "basemetals:lead_lever" + }, + "group": "basemetals:lead_lever" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_nuggets.json b/src/generated/resources/data/basemetals/recipes/lead_nuggets.json index a518bf4f..59377dc8 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/lead_nuggets.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:ingots/lead" - } - ], - "result": { - "item": "basemetals:lead_nugget", - "count": 9 - }, - "group": "basemetals:lead_nugget" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/lead" + } + ], + "result": { + "item": "basemetals:lead_nugget", + "count": 9 + }, + "group": "basemetals:lead_nugget" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_pickaxe.json b/src/generated/resources/data/basemetals/recipes/lead_pickaxe.json index 4987bf42..d2be014d 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/lead_pickaxe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " S ", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " S ", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/lead" + } }, - "X": { - "tag": "forge:ingots/lead" - } - }, - "result": { - "item": "basemetals:lead_pickaxe" - }, - "group": "basemetals:lead_pickaxe" + "result": { + "item": "basemetals:lead_pickaxe" + }, + "group": "basemetals:lead_pickaxe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_plate.json b/src/generated/resources/data/basemetals/recipes/lead_plate.json index 306976b5..cd2ba8b5 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_plate.json +++ b/src/generated/resources/data/basemetals/recipes/lead_plate.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/lead" - } - }, - "result": { - "item": "basemetals:lead_plate", - "count": 3 - }, - "group": "basemetals:lead_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/lead" + } + }, + "result": { + "item": "basemetals:lead_plate", + "count": 3 + }, + "group": "basemetals:lead_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/lead_powder_from_small.json index d9d74e42..54a0f0d1 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/lead_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/lead" - } - }, - "result": { - "item": "basemetals:lead_powder" - }, - "group": "basemetals:lead_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/lead" + } + }, + "result": { + "item": "basemetals:lead_powder" + }, + "group": "basemetals:lead_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/lead_pressure_plate.json index 1d88e78c..3883b1ae 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/lead_pressure_plate.json @@ -1,15 +1,18 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/lead" - } - }, - "result": { - "item": "basemetals:lead_pressure_plate" - }, - "group": "basemetals:lead_pressure_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/lead" + } + }, + "result": { + "item": "basemetals:lead_pressure_plate" + }, + "group": "basemetals:lead_pressure_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_rod.json b/src/generated/resources/data/basemetals/recipes/lead_rod.json index d6b6ac3f..a11c5af4 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_rod.json +++ b/src/generated/resources/data/basemetals/recipes/lead_rod.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:ingots/lead" - } - }, - "result": { - "item": "basemetals:lead_rod", - "count": 4 - }, - "group": "basemetals:lead_rod" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:ingots/lead" + } + }, + "result": { + "item": "basemetals:lead_rod", + "count": 4 + }, + "group": "basemetals:lead_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_scythe.json b/src/generated/resources/data/basemetals/recipes/lead_scythe.json index 10ee81a4..f4125656 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/lead_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/lead" + } }, - "X": { - "tag": "forge:ingots/lead" - } - }, - "result": { - "item": "basemetals:lead_scythe" - }, - "group": "basemetals:lead_scythe" + "result": { + "item": "basemetals:lead_scythe" + }, + "group": "basemetals:lead_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_shears.json b/src/generated/resources/data/basemetals/recipes/lead_shears.json index 7353701e..28c78dae 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_shears.json +++ b/src/generated/resources/data/basemetals/recipes/lead_shears.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "X " - ], - "key": { - "X": { - "tag": "forge:ingots/lead" - } - }, - "result": { - "item": "basemetals:lead_shears" - }, - "group": "basemetals:lead_shears" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "X " + ], + "key": { + "X": { + "tag": "forge:ingots/lead" + } + }, + "result": { + "item": "basemetals:lead_shears" + }, + "group": "basemetals:lead_shears" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_shield.json b/src/generated/resources/data/basemetals/recipes/lead_shield.json index 2cdd0735..33523f18 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_shield.json +++ b/src/generated/resources/data/basemetals/recipes/lead_shield.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XWX", - "XXX", - " X " - ], - "key": { - "W": { - "tag": "minecraft:planks" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XWX", + "XXX", + " X " + ], + "key": { + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:ingots/lead" + } }, - "X": { - "tag": "forge:ingots/lead" - } - }, - "result": { - "item": "basemetals:lead_shield" - }, - "group": "basemetals:lead_shield" + "result": { + "item": "basemetals:lead_shield" + }, + "group": "basemetals:lead_shield" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_shovel.json b/src/generated/resources/data/basemetals/recipes/lead_shovel.json index 949d5b5c..13b042a0 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/lead_shovel.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/lead" + } }, - "X": { - "tag": "forge:ingots/lead" - } - }, - "result": { - "item": "basemetals:lead_shovel" - }, - "group": "basemetals:lead_shovel" + "result": { + "item": "basemetals:lead_shovel" + }, + "group": "basemetals:lead_shovel" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_slab.json b/src/generated/resources/data/basemetals/recipes/lead_slab.json index 43fcfbbc..0a4d461b 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_slab.json +++ b/src/generated/resources/data/basemetals/recipes/lead_slab.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/lead" - } - }, - "result": { - "item": "basemetals:lead_slab", - "count": 6 - }, - "group": "basemetals:lead_slab" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/lead" + } + }, + "result": { + "item": "basemetals:lead_slab", + "count": 6 + }, + "group": "basemetals:lead_slab" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_smallpowder.json b/src/generated/resources/data/basemetals/recipes/lead_smallpowder.json index 962bf8c5..49c2b175 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/lead_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/lead" - } - ], - "result": { - "item": "basemetals:lead_smallpowder", - "count": 9 - }, - "group": "basemetals:lead_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/lead" + } + ], + "result": { + "item": "basemetals:lead_smallpowder", + "count": 9 + }, + "group": "basemetals:lead_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_stairs.json b/src/generated/resources/data/basemetals/recipes/lead_stairs.json index e2d67999..91177b64 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/lead_stairs.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X ", - "XX ", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/lead" - } - }, - "result": { - "item": "basemetals:lead_stairs", - "count": 4 - }, - "group": "basemetals:lead_stairs" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/lead" + } + }, + "result": { + "item": "basemetals:lead_stairs", + "count": 4 + }, + "group": "basemetals:lead_stairs" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_sword.json b/src/generated/resources/data/basemetals/recipes/lead_sword.json index 62b8456a..c55887a8 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_sword.json +++ b/src/generated/resources/data/basemetals/recipes/lead_sword.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/lead" + } }, - "X": { - "tag": "forge:ingots/lead" - } - }, - "result": { - "item": "basemetals:lead_sword" - }, - "group": "basemetals:lead_sword" + "result": { + "item": "basemetals:lead_sword" + }, + "group": "basemetals:lead_sword" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_trapdoor.json b/src/generated/resources/data/basemetals/recipes/lead_trapdoor.json index f73dc116..ae91f16f 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/lead_trapdoor.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/lead" - } - }, - "result": { - "item": "basemetals:lead_trapdoor" - }, - "group": "basemetals:lead_trapdoor" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/lead" + } + }, + "result": { + "item": "basemetals:lead_trapdoor" + }, + "group": "basemetals:lead_trapdoor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/lead_wall.json b/src/generated/resources/data/basemetals/recipes/lead_wall.json index 0d1d1f2e..8197aebb 100644 --- a/src/generated/resources/data/basemetals/recipes/lead_wall.json +++ b/src/generated/resources/data/basemetals/recipes/lead_wall.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/lead" - } - }, - "result": { - "item": "basemetals:lead_wall", - "count": 6 - }, - "group": "basemetals:lead_wall" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/lead" + } + }, + "result": { + "item": "basemetals:lead_wall", + "count": 6 + }, + "group": "basemetals:lead_wall" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mercury_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/mercury_ingot_from_nuggets.json index 4d2e43d5..56c721c9 100644 --- a/src/generated/resources/data/basemetals/recipes/mercury_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/mercury_ingot_from_nuggets.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:nuggets/mercury" - } - }, - "result": { - "item": "basemetals:mercury_ingot" - }, - "group": "basemetals:mercury_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:nuggets/mercury" + } + }, + "result": { + "item": "basemetals:mercury_ingot" + }, + "group": "basemetals:mercury_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mercury_nuggets.json b/src/generated/resources/data/basemetals/recipes/mercury_nuggets.json index 01cef667..5f62ffa2 100644 --- a/src/generated/resources/data/basemetals/recipes/mercury_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/mercury_nuggets.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:ingots/mercury" - } - ], - "result": { - "item": "basemetals:mercury_nugget", - "count": 9 - }, - "group": "basemetals:mercury_nugget" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/mercury" + } + ], + "result": { + "item": "basemetals:mercury_nugget", + "count": 9 + }, + "group": "basemetals:mercury_nugget" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mercury_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/mercury_powder_from_small.json index e62a9397..75b8c60d 100644 --- a/src/generated/resources/data/basemetals/recipes/mercury_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/mercury_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/mercury" - } - }, - "result": { - "item": "basemetals:mercury_powder" - }, - "group": "basemetals:mercury_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/mercury" + } + }, + "result": { + "item": "basemetals:mercury_powder" + }, + "group": "basemetals:mercury_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mercury_smallpowder.json b/src/generated/resources/data/basemetals/recipes/mercury_smallpowder.json index a70f2dc8..627bfbb2 100644 --- a/src/generated/resources/data/basemetals/recipes/mercury_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/mercury_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/mercury" - } - ], - "result": { - "item": "basemetals:mercury_smallpowder", - "count": 9 - }, - "group": "basemetals:mercury_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/mercury" + } + ], + "result": { + "item": "basemetals:mercury_smallpowder", + "count": 9 + }, + "group": "basemetals:mercury_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mercury_smallpowder_smelting.json b/src/generated/resources/data/basemetals/recipes/mercury_smallpowder_smelting.json index 86851499..2c0aa36d 100644 --- a/src/generated/resources/data/basemetals/recipes/mercury_smallpowder_smelting.json +++ b/src/generated/resources/data/basemetals/recipes/mercury_smallpowder_smelting.json @@ -1,9 +1,11 @@ { - "type": "minecraft:smelting", + "type": "basemetals:legacy_smelting", "ingredient": { "tag": "forge:tiny_dusts/mercury" }, - "result": "basemetals:mercury_nugget", + "result": { + "item": "basemetals:mercury_nugget" + }, "experience": 0.01, "cookingtime": 200 -} \ No newline at end of file +} diff --git a/src/generated/resources/data/basemetals/recipes/minecart.json b/src/generated/resources/data/basemetals/recipes/minecart.json index e70c3963..e775d0da 100644 --- a/src/generated/resources/data/basemetals/recipes/minecart.json +++ b/src/generated/resources/data/basemetals/recipes/minecart.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "minecraft:minecart" - }, - "group": "minecraft:minecart" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/steel" + } + }, + "result": { + "item": "minecraft:minecart" + }, + "group": "minecraft:minecart" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_arrow.json b/src/generated/resources/data/basemetals/recipes/mithril_arrow.json index 7cdfa8be..6e92e6da 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_arrow.json @@ -1,24 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "N", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "N", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "N": { + "tag": "forge:nuggets/mithril" + }, + "R": { + "tag": "forge:rods/mithril" + } }, - "N": { - "tag": "forge:nuggets/mithril" + "result": { + "item": "basemetals:mithril_arrow", + "count": 4 }, - "R": { - "tag": "forge:rods/mithril" - } - }, - "result": { - "item": "basemetals:mithril_arrow", - "count": 4 - }, - "group": "basemetals:mithril_arrow" + "group": "basemetals:mithril_arrow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_axe.json b/src/generated/resources/data/basemetals/recipes/mithril_axe.json index 7f39a4fe..c0f74b87 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_axe.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_axe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XS", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XS", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/mithril" + } }, - "X": { - "tag": "forge:ingots/mithril" - } - }, - "result": { - "item": "basemetals:mithril_axe" - }, - "group": "basemetals:mithril_axe" + "result": { + "item": "basemetals:mithril_axe" + }, + "group": "basemetals:mithril_axe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_bars.json b/src/generated/resources/data/basemetals/recipes/mithril_bars.json index c26ce8d7..556e407b 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_bars.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_bars.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/mithril" - } - }, - "result": { - "item": "basemetals:mithril_bars", - "count": 16 - }, - "group": "basemetals:mithril_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/mithril" + } + }, + "result": { + "item": "basemetals:mithril_bars", + "count": 16 + }, + "group": "basemetals:mithril_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_bars_2.json b/src/generated/resources/data/basemetals/recipes/mithril_bars_2.json index 6ee39878..cd7475bb 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_bars_2.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:rods/mithril" - } - }, - "result": { - "item": "basemetals:mithril_bars", - "count": 4 - }, - "group": "basemetals:mithril_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:rods/mithril" + } + }, + "result": { + "item": "basemetals:mithril_bars", + "count": 4 + }, + "group": "basemetals:mithril_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_blend.json b/src/generated/resources/data/basemetals/recipes/mithril_blend.json index 9689bd53..c2273719 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_blend.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_blend.json @@ -1,22 +1,25 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/silver" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/silver" + }, + { + "tag": "forge:dusts/silver" + }, + { + "tag": "forge:dusts/coldiron" + }, + { + "tag": "forge:ingots/mercury" + } + ], + "result": { + "item": "basemetals:mithril_blend", + "count": 3 }, - { - "tag": "forge:dusts/silver" - }, - { - "tag": "forge:dusts/coldiron" - }, - { - "tag": "forge:ingots/mercury" - } - ], - "result": { - "item": "basemetals:mithril_blend", - "count": 3 - }, - "group": "basemetals:mithril_blend" + "group": "basemetals:mithril_blend" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_blend_from_small.json b/src/generated/resources/data/basemetals/recipes/mithril_blend_from_small.json index 2c87d140..360aad1d 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_blend_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_blend_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:small_blends/mithril" - } - }, - "result": { - "item": "basemetals:mithril_blend" - }, - "group": "basemetals:mithril_blend" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:small_blends/mithril" + } + }, + "result": { + "item": "basemetals:mithril_blend" + }, + "group": "basemetals:mithril_blend" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_block.json b/src/generated/resources/data/basemetals/recipes/mithril_block.json index 0326bc1a..f04e9c02 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_block.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_block.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/mithril" - } - }, - "result": { - "item": "basemetals:mithril_block" - }, - "group": "basemetals:mithril_block" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/mithril" + } + }, + "result": { + "item": "basemetals:mithril_block" + }, + "group": "basemetals:mithril_block" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_block_ingot.json b/src/generated/resources/data/basemetals/recipes/mithril_block_ingot.json index cdf17c5f..2c69f80e 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_block_ingot.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/mithril" - } - ], - "result": { - "item": "basemetals:mithril_ingot", - "count": 9 - }, - "group": "basemetals:mithril_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/mithril" + } + ], + "result": { + "item": "basemetals:mithril_ingot", + "count": 9 + }, + "group": "basemetals:mithril_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_bolt.json b/src/generated/resources/data/basemetals/recipes/mithril_bolt.json index ea5a0e62..61231998 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_bolt.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "R": { + "tag": "forge:rods/mithril" + } }, - "R": { - "tag": "forge:rods/mithril" - } - }, - "result": { - "item": "basemetals:mithril_bolt", - "count": 4 - }, - "group": "basemetals:mithril_bolt" + "result": { + "item": "basemetals:mithril_bolt", + "count": 4 + }, + "group": "basemetals:mithril_bolt" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_boots.json b/src/generated/resources/data/basemetals/recipes/mithril_boots.json index 39c276c8..ae60b162 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_boots.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_boots.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/mithril" - } - }, - "result": { - "item": "basemetals:mithril_boots" - }, - "group": "basemetals:mithril_boots" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/mithril" + } + }, + "result": { + "item": "basemetals:mithril_boots" + }, + "group": "basemetals:mithril_boots" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_bow.json b/src/generated/resources/data/basemetals/recipes/mithril_bow.json index 818460ef..89ff6f13 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_bow.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_bow.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " RS", - "R S", - " RS" - ], - "key": { - "R": { - "tag": "forge:rods/mithril" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " RS", + "R S", + " RS" + ], + "key": { + "R": { + "tag": "forge:rods/mithril" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:mithril_bow" - }, - "group": "basemetals:mithril_bow" + "result": { + "item": "basemetals:mithril_bow" + }, + "group": "basemetals:mithril_bow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_button.json b/src/generated/resources/data/basemetals/recipes/mithril_button.json index e254241a..89cd0ba6 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_button.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_button.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:nuggets/mithril" - } - }, - "result": { - "item": "basemetals:mithril_button" - }, - "group": "basemetals:mithril_button" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:nuggets/mithril" + } + }, + "result": { + "item": "basemetals:mithril_button" + }, + "group": "basemetals:mithril_button" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_chestplate.json b/src/generated/resources/data/basemetals/recipes/mithril_chestplate.json index a103ac28..21398545 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_chestplate.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/mithril" - } - }, - "result": { - "item": "basemetals:mithril_chestplate" - }, - "group": "basemetals:mithril_chestplate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/mithril" + } + }, + "result": { + "item": "basemetals:mithril_chestplate" + }, + "group": "basemetals:mithril_chestplate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_crackhammer.json b/src/generated/resources/data/basemetals/recipes/mithril_crackhammer.json index 3f55abe2..494ef39f 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:storage_blocks/mithril" + } }, - "X": { - "tag": "forge:storage_blocks/mithril" - } - }, - "result": { - "item": "basemetals:mithril_crackhammer" - }, - "group": "basemetals:mithril_crackhammer" + "result": { + "item": "basemetals:mithril_crackhammer" + }, + "group": "basemetals:mithril_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_crossbow.json b/src/generated/resources/data/basemetals/recipes/mithril_crossbow.json index 4e66d2e5..091777d6 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_crossbow.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRR", - " SR", - "R G" - ], - "key": { - "G": { - "tag": "forge:gears/mithril" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRR", + " SR", + "R G" + ], + "key": { + "G": { + "tag": "forge:gears/mithril" + }, + "R": { + "tag": "forge:rods/mithril" + }, + "S": { + "item": "minecraft:string" + } }, - "R": { - "tag": "forge:rods/mithril" + "result": { + "item": "basemetals:mithril_crossbow" }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:mithril_crossbow" - }, - "group": "basemetals:mithril_crossbow" + "group": "basemetals:mithril_crossbow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_door.json b/src/generated/resources/data/basemetals/recipes/mithril_door.json index 62440c0c..a74132d6 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_door.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_door.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/mithril" - } - }, - "result": { - "item": "basemetals:mithril_door", - "count": 3 - }, - "group": "basemetals:mithril_door" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/mithril" + } + }, + "result": { + "item": "basemetals:mithril_door", + "count": 3 + }, + "group": "basemetals:mithril_door" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_fishingrod.json b/src/generated/resources/data/basemetals/recipes/mithril_fishingrod.json index 685c5ceb..f41ce6e9 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_fishingrod.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " R", - " RS", - "R S" - ], - "key": { - "R": { - "tag": "forge:rods/mithril" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " R", + " RS", + "R S" + ], + "key": { + "R": { + "tag": "forge:rods/mithril" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:mithril_fishing_rod" - }, - "group": "basemetals:mithril_fishing_rod" + "result": { + "item": "basemetals:mithril_fishing_rod" + }, + "group": "basemetals:mithril_fishing_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_gear.json b/src/generated/resources/data/basemetals/recipes/mithril_gear.json index 6f5b1579..63d890c4 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_gear.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_gear.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "XRX", - " X " - ], - "key": { - "R": { - "tag": "forge:rods/mithril" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XRX", + " X " + ], + "key": { + "R": { + "tag": "forge:rods/mithril" + }, + "X": { + "tag": "forge:ingots/mithril" + } }, - "X": { - "tag": "forge:ingots/mithril" - } - }, - "result": { - "item": "basemetals:mithril_gear", - "count": 4 - }, - "group": "basemetals:mithril_gear" + "result": { + "item": "basemetals:mithril_gear", + "count": 4 + }, + "group": "basemetals:mithril_gear" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_helmet.json b/src/generated/resources/data/basemetals/recipes/mithril_helmet.json index 8c77d05c..aad83d7c 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_helmet.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/mithril" - } - }, - "result": { - "item": "basemetals:mithril_helmet" - }, - "group": "basemetals:mithril_helmet" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/mithril" + } + }, + "result": { + "item": "basemetals:mithril_helmet" + }, + "group": "basemetals:mithril_helmet" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_hoe.json b/src/generated/resources/data/basemetals/recipes/mithril_hoe.json index 1a40eca3..7232b49c 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_hoe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - " S", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " S", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/mithril" + } }, - "X": { - "tag": "forge:ingots/mithril" - } - }, - "result": { - "item": "basemetals:mithril_hoe" - }, - "group": "basemetals:mithril_hoe" + "result": { + "item": "basemetals:mithril_hoe" + }, + "group": "basemetals:mithril_hoe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_horsearmor.json b/src/generated/resources/data/basemetals/recipes/mithril_horsearmor.json index 1e928577..61e4cd63 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_horsearmor.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "XWX", - "XXX" - ], - "key": { - "W": { - "tag": "minecraft:wool" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "XWX", + "XXX" + ], + "key": { + "W": { + "tag": "minecraft:wool" + }, + "X": { + "tag": "forge:ingots/mithril" + } }, - "X": { - "tag": "forge:ingots/mithril" - } - }, - "result": { - "item": "basemetals:mithril_horse_armor" - }, - "group": "basemetals:mithril_horse_armor" + "result": { + "item": "basemetals:mithril_horse_armor" + }, + "group": "basemetals:mithril_horse_armor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/mithril_ingot_from_nuggets.json index 246a4928..60485bbe 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_ingot_from_nuggets.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:nuggets/mithril" - } - }, - "result": { - "item": "basemetals:mithril_ingot" - }, - "group": "basemetals:mithril_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:nuggets/mithril" + } + }, + "result": { + "item": "basemetals:mithril_ingot" + }, + "group": "basemetals:mithril_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_leggings.json b/src/generated/resources/data/basemetals/recipes/mithril_leggings.json index b6b0ac4c..80cdf794 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_leggings.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/mithril" - } - }, - "result": { - "item": "basemetals:mithril_leggings" - }, - "group": "basemetals:mithril_leggings" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/mithril" + } + }, + "result": { + "item": "basemetals:mithril_leggings" + }, + "group": "basemetals:mithril_leggings" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_lever.json b/src/generated/resources/data/basemetals/recipes/mithril_lever.json index 4427a8d4..32971086 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_lever.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_lever.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "X" - ], - "key": { - "R": { - "tag": "forge:rods/mithril" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "X" + ], + "key": { + "R": { + "tag": "forge:rods/mithril" + }, + "X": { + "tag": "forge:ingots/mithril" + } }, - "X": { - "tag": "forge:ingots/mithril" - } - }, - "result": { - "item": "basemetals:mithril_lever" - }, - "group": "basemetals:mithril_lever" + "result": { + "item": "basemetals:mithril_lever" + }, + "group": "basemetals:mithril_lever" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_nuggets.json b/src/generated/resources/data/basemetals/recipes/mithril_nuggets.json index 5b9de7a8..cede44cd 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_nuggets.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:ingots/mithril" - } - ], - "result": { - "item": "basemetals:mithril_nugget", - "count": 9 - }, - "group": "basemetals:mithril_nugget" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/mithril" + } + ], + "result": { + "item": "basemetals:mithril_nugget", + "count": 9 + }, + "group": "basemetals:mithril_nugget" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_pickaxe.json b/src/generated/resources/data/basemetals/recipes/mithril_pickaxe.json index 434bbcf6..b7bd5459 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_pickaxe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " S ", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " S ", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/mithril" + } }, - "X": { - "tag": "forge:ingots/mithril" - } - }, - "result": { - "item": "basemetals:mithril_pickaxe" - }, - "group": "basemetals:mithril_pickaxe" + "result": { + "item": "basemetals:mithril_pickaxe" + }, + "group": "basemetals:mithril_pickaxe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_plate.json b/src/generated/resources/data/basemetals/recipes/mithril_plate.json index 6cc293e0..ea0f744c 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_plate.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_plate.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/mithril" - } - }, - "result": { - "item": "basemetals:mithril_plate", - "count": 3 - }, - "group": "basemetals:mithril_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/mithril" + } + }, + "result": { + "item": "basemetals:mithril_plate", + "count": 3 + }, + "group": "basemetals:mithril_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/mithril_powder_from_small.json index d8f04438..3cbe3110 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/mithril" - } - }, - "result": { - "item": "basemetals:mithril_powder" - }, - "group": "basemetals:mithril_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/mithril" + } + }, + "result": { + "item": "basemetals:mithril_powder" + }, + "group": "basemetals:mithril_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/mithril_pressure_plate.json index d2aaf4f3..4fbba2f6 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_pressure_plate.json @@ -1,15 +1,18 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/mithril" - } - }, - "result": { - "item": "basemetals:mithril_pressure_plate" - }, - "group": "basemetals:mithril_pressure_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/mithril" + } + }, + "result": { + "item": "basemetals:mithril_pressure_plate" + }, + "group": "basemetals:mithril_pressure_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_rod.json b/src/generated/resources/data/basemetals/recipes/mithril_rod.json index 0b77e0a5..11664854 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_rod.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_rod.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:ingots/mithril" - } - }, - "result": { - "item": "basemetals:mithril_rod", - "count": 4 - }, - "group": "basemetals:mithril_rod" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:ingots/mithril" + } + }, + "result": { + "item": "basemetals:mithril_rod", + "count": 4 + }, + "group": "basemetals:mithril_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_scythe.json b/src/generated/resources/data/basemetals/recipes/mithril_scythe.json index dcbc4df9..e831a413 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/mithril" + } }, - "X": { - "tag": "forge:ingots/mithril" - } - }, - "result": { - "item": "basemetals:mithril_scythe" - }, - "group": "basemetals:mithril_scythe" + "result": { + "item": "basemetals:mithril_scythe" + }, + "group": "basemetals:mithril_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_shears.json b/src/generated/resources/data/basemetals/recipes/mithril_shears.json index 89c18671..4bfd74c1 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_shears.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_shears.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "X " - ], - "key": { - "X": { - "tag": "forge:ingots/mithril" - } - }, - "result": { - "item": "basemetals:mithril_shears" - }, - "group": "basemetals:mithril_shears" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "X " + ], + "key": { + "X": { + "tag": "forge:ingots/mithril" + } + }, + "result": { + "item": "basemetals:mithril_shears" + }, + "group": "basemetals:mithril_shears" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_shield.json b/src/generated/resources/data/basemetals/recipes/mithril_shield.json index 97792cfd..f3f269a1 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_shield.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_shield.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XWX", - "XXX", - " X " - ], - "key": { - "W": { - "tag": "minecraft:planks" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XWX", + "XXX", + " X " + ], + "key": { + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:ingots/mithril" + } }, - "X": { - "tag": "forge:ingots/mithril" - } - }, - "result": { - "item": "basemetals:mithril_shield" - }, - "group": "basemetals:mithril_shield" + "result": { + "item": "basemetals:mithril_shield" + }, + "group": "basemetals:mithril_shield" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_shovel.json b/src/generated/resources/data/basemetals/recipes/mithril_shovel.json index 72118285..b15e1193 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_shovel.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/mithril" + } }, - "X": { - "tag": "forge:ingots/mithril" - } - }, - "result": { - "item": "basemetals:mithril_shovel" - }, - "group": "basemetals:mithril_shovel" + "result": { + "item": "basemetals:mithril_shovel" + }, + "group": "basemetals:mithril_shovel" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_slab.json b/src/generated/resources/data/basemetals/recipes/mithril_slab.json index 629be38c..2285b140 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_slab.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_slab.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/mithril" - } - }, - "result": { - "item": "basemetals:mithril_slab", - "count": 6 - }, - "group": "basemetals:mithril_slab" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/mithril" + } + }, + "result": { + "item": "basemetals:mithril_slab", + "count": 6 + }, + "group": "basemetals:mithril_slab" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_smallblend.json b/src/generated/resources/data/basemetals/recipes/mithril_smallblend.json index 06aced95..9d548665 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_smallblend.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_smallblend.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:blends/mithril" - } - ], - "result": { - "item": "basemetals:mithril_smallblend", - "count": 9 - }, - "group": "basemetals:mithril_smallblend" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:blends/mithril" + } + ], + "result": { + "item": "basemetals:mithril_smallblend", + "count": 9 + }, + "group": "basemetals:mithril_smallblend" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_smallpowder.json b/src/generated/resources/data/basemetals/recipes/mithril_smallpowder.json index 57c87ec1..49477617 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/mithril" - } - ], - "result": { - "item": "basemetals:mithril_smallpowder", - "count": 9 - }, - "group": "basemetals:mithril_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/mithril" + } + ], + "result": { + "item": "basemetals:mithril_smallpowder", + "count": 9 + }, + "group": "basemetals:mithril_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_stairs.json b/src/generated/resources/data/basemetals/recipes/mithril_stairs.json index 24bfce5f..9d8f0be0 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_stairs.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X ", - "XX ", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/mithril" - } - }, - "result": { - "item": "basemetals:mithril_stairs", - "count": 4 - }, - "group": "basemetals:mithril_stairs" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/mithril" + } + }, + "result": { + "item": "basemetals:mithril_stairs", + "count": 4 + }, + "group": "basemetals:mithril_stairs" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_sword.json b/src/generated/resources/data/basemetals/recipes/mithril_sword.json index 39ee84e7..6b798423 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_sword.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_sword.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/mithril" + } }, - "X": { - "tag": "forge:ingots/mithril" - } - }, - "result": { - "item": "basemetals:mithril_sword" - }, - "group": "basemetals:mithril_sword" + "result": { + "item": "basemetals:mithril_sword" + }, + "group": "basemetals:mithril_sword" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_trapdoor.json b/src/generated/resources/data/basemetals/recipes/mithril_trapdoor.json index 3eb32eab..c1af9755 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_trapdoor.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/mithril" - } - }, - "result": { - "item": "basemetals:mithril_trapdoor" - }, - "group": "basemetals:mithril_trapdoor" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/mithril" + } + }, + "result": { + "item": "basemetals:mithril_trapdoor" + }, + "group": "basemetals:mithril_trapdoor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/mithril_wall.json b/src/generated/resources/data/basemetals/recipes/mithril_wall.json index 4b491069..598a89e0 100644 --- a/src/generated/resources/data/basemetals/recipes/mithril_wall.json +++ b/src/generated/resources/data/basemetals/recipes/mithril_wall.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/mithril" - } - }, - "result": { - "item": "basemetals:mithril_wall", - "count": 6 - }, - "group": "basemetals:mithril_wall" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/mithril" + } + }, + "result": { + "item": "basemetals:mithril_wall", + "count": 6 + }, + "group": "basemetals:mithril_wall" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_arrow.json b/src/generated/resources/data/basemetals/recipes/nickel_arrow.json index 0bd88920..1ec45d4c 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_arrow.json @@ -1,24 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "N", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "N", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "N": { + "tag": "forge:nuggets/nickel" + }, + "R": { + "tag": "forge:rods/nickel" + } }, - "N": { - "tag": "forge:nuggets/nickel" + "result": { + "item": "basemetals:nickel_arrow", + "count": 4 }, - "R": { - "tag": "forge:rods/nickel" - } - }, - "result": { - "item": "basemetals:nickel_arrow", - "count": 4 - }, - "group": "basemetals:nickel_arrow" + "group": "basemetals:nickel_arrow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_axe.json b/src/generated/resources/data/basemetals/recipes/nickel_axe.json index 9924e711..26e5b855 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_axe.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_axe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XS", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XS", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/nickel" + } }, - "X": { - "tag": "forge:ingots/nickel" - } - }, - "result": { - "item": "basemetals:nickel_axe" - }, - "group": "basemetals:nickel_axe" + "result": { + "item": "basemetals:nickel_axe" + }, + "group": "basemetals:nickel_axe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_bars.json b/src/generated/resources/data/basemetals/recipes/nickel_bars.json index 88545bf9..1ebb1298 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_bars.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_bars.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/nickel" - } - }, - "result": { - "item": "basemetals:nickel_bars", - "count": 16 - }, - "group": "basemetals:nickel_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/nickel" + } + }, + "result": { + "item": "basemetals:nickel_bars", + "count": 16 + }, + "group": "basemetals:nickel_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_bars_2.json b/src/generated/resources/data/basemetals/recipes/nickel_bars_2.json index 7c1690f8..207027c2 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_bars_2.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:rods/nickel" - } - }, - "result": { - "item": "basemetals:nickel_bars", - "count": 4 - }, - "group": "basemetals:nickel_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:rods/nickel" + } + }, + "result": { + "item": "basemetals:nickel_bars", + "count": 4 + }, + "group": "basemetals:nickel_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_block.json b/src/generated/resources/data/basemetals/recipes/nickel_block.json index f2d69080..4ad67f84 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_block.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_block.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/nickel" - } - }, - "result": { - "item": "basemetals:nickel_block" - }, - "group": "basemetals:nickel_block" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/nickel" + } + }, + "result": { + "item": "basemetals:nickel_block" + }, + "group": "basemetals:nickel_block" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_block_ingot.json b/src/generated/resources/data/basemetals/recipes/nickel_block_ingot.json index a42d43e0..249ff730 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_block_ingot.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/nickel" - } - ], - "result": { - "item": "basemetals:nickel_ingot", - "count": 9 - }, - "group": "basemetals:nickel_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/nickel" + } + ], + "result": { + "item": "basemetals:nickel_ingot", + "count": 9 + }, + "group": "basemetals:nickel_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_bolt.json b/src/generated/resources/data/basemetals/recipes/nickel_bolt.json index a0d726fd..8f8c06e5 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_bolt.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "R": { + "tag": "forge:rods/nickel" + } }, - "R": { - "tag": "forge:rods/nickel" - } - }, - "result": { - "item": "basemetals:nickel_bolt", - "count": 4 - }, - "group": "basemetals:nickel_bolt" + "result": { + "item": "basemetals:nickel_bolt", + "count": 4 + }, + "group": "basemetals:nickel_bolt" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_boots.json b/src/generated/resources/data/basemetals/recipes/nickel_boots.json index a221933e..00d3d100 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_boots.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_boots.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/nickel" - } - }, - "result": { - "item": "basemetals:nickel_boots" - }, - "group": "basemetals:nickel_boots" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/nickel" + } + }, + "result": { + "item": "basemetals:nickel_boots" + }, + "group": "basemetals:nickel_boots" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_bow.json b/src/generated/resources/data/basemetals/recipes/nickel_bow.json index e89805bf..49f5eccd 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_bow.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_bow.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " RS", - "R S", - " RS" - ], - "key": { - "R": { - "tag": "forge:rods/nickel" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " RS", + "R S", + " RS" + ], + "key": { + "R": { + "tag": "forge:rods/nickel" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:nickel_bow" - }, - "group": "basemetals:nickel_bow" + "result": { + "item": "basemetals:nickel_bow" + }, + "group": "basemetals:nickel_bow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_button.json b/src/generated/resources/data/basemetals/recipes/nickel_button.json index 48f42c78..78d6d6ae 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_button.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_button.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:nuggets/nickel" - } - }, - "result": { - "item": "basemetals:nickel_button" - }, - "group": "basemetals:nickel_button" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:nuggets/nickel" + } + }, + "result": { + "item": "basemetals:nickel_button" + }, + "group": "basemetals:nickel_button" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_chestplate.json b/src/generated/resources/data/basemetals/recipes/nickel_chestplate.json index 48d4c649..b56532e5 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_chestplate.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/nickel" - } - }, - "result": { - "item": "basemetals:nickel_chestplate" - }, - "group": "basemetals:nickel_chestplate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/nickel" + } + }, + "result": { + "item": "basemetals:nickel_chestplate" + }, + "group": "basemetals:nickel_chestplate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_crackhammer.json b/src/generated/resources/data/basemetals/recipes/nickel_crackhammer.json index 1ada9399..995112d3 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:storage_blocks/nickel" + } }, - "X": { - "tag": "forge:storage_blocks/nickel" - } - }, - "result": { - "item": "basemetals:nickel_crackhammer" - }, - "group": "basemetals:nickel_crackhammer" + "result": { + "item": "basemetals:nickel_crackhammer" + }, + "group": "basemetals:nickel_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_crossbow.json b/src/generated/resources/data/basemetals/recipes/nickel_crossbow.json index 01d290e3..c9b82dbd 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_crossbow.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRR", - " SR", - "R G" - ], - "key": { - "G": { - "tag": "forge:gears/nickel" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRR", + " SR", + "R G" + ], + "key": { + "G": { + "tag": "forge:gears/nickel" + }, + "R": { + "tag": "forge:rods/nickel" + }, + "S": { + "item": "minecraft:string" + } }, - "R": { - "tag": "forge:rods/nickel" + "result": { + "item": "basemetals:nickel_crossbow" }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:nickel_crossbow" - }, - "group": "basemetals:nickel_crossbow" + "group": "basemetals:nickel_crossbow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_door.json b/src/generated/resources/data/basemetals/recipes/nickel_door.json index 907417fa..a063453d 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_door.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_door.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/nickel" - } - }, - "result": { - "item": "basemetals:nickel_door", - "count": 3 - }, - "group": "basemetals:nickel_door" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/nickel" + } + }, + "result": { + "item": "basemetals:nickel_door", + "count": 3 + }, + "group": "basemetals:nickel_door" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_fishingrod.json b/src/generated/resources/data/basemetals/recipes/nickel_fishingrod.json index 017dfed4..f3530775 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_fishingrod.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " R", - " RS", - "R S" - ], - "key": { - "R": { - "tag": "forge:rods/nickel" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " R", + " RS", + "R S" + ], + "key": { + "R": { + "tag": "forge:rods/nickel" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:nickel_fishing_rod" - }, - "group": "basemetals:nickel_fishing_rod" + "result": { + "item": "basemetals:nickel_fishing_rod" + }, + "group": "basemetals:nickel_fishing_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_gear.json b/src/generated/resources/data/basemetals/recipes/nickel_gear.json index 0b3ac1a5..ec1c0c50 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_gear.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_gear.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "XRX", - " X " - ], - "key": { - "R": { - "tag": "forge:rods/nickel" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XRX", + " X " + ], + "key": { + "R": { + "tag": "forge:rods/nickel" + }, + "X": { + "tag": "forge:ingots/nickel" + } }, - "X": { - "tag": "forge:ingots/nickel" - } - }, - "result": { - "item": "basemetals:nickel_gear", - "count": 4 - }, - "group": "basemetals:nickel_gear" + "result": { + "item": "basemetals:nickel_gear", + "count": 4 + }, + "group": "basemetals:nickel_gear" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_helmet.json b/src/generated/resources/data/basemetals/recipes/nickel_helmet.json index d6dc5b5f..1d13d87a 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_helmet.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/nickel" - } - }, - "result": { - "item": "basemetals:nickel_helmet" - }, - "group": "basemetals:nickel_helmet" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/nickel" + } + }, + "result": { + "item": "basemetals:nickel_helmet" + }, + "group": "basemetals:nickel_helmet" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_hoe.json b/src/generated/resources/data/basemetals/recipes/nickel_hoe.json index 16b7fd84..9d309b53 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_hoe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - " S", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " S", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/nickel" + } }, - "X": { - "tag": "forge:ingots/nickel" - } - }, - "result": { - "item": "basemetals:nickel_hoe" - }, - "group": "basemetals:nickel_hoe" + "result": { + "item": "basemetals:nickel_hoe" + }, + "group": "basemetals:nickel_hoe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_horsearmor.json b/src/generated/resources/data/basemetals/recipes/nickel_horsearmor.json index 7a3614ea..f515b223 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_horsearmor.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "XWX", - "XXX" - ], - "key": { - "W": { - "tag": "minecraft:wool" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "XWX", + "XXX" + ], + "key": { + "W": { + "tag": "minecraft:wool" + }, + "X": { + "tag": "forge:ingots/nickel" + } }, - "X": { - "tag": "forge:ingots/nickel" - } - }, - "result": { - "item": "basemetals:nickel_horse_armor" - }, - "group": "basemetals:nickel_horse_armor" + "result": { + "item": "basemetals:nickel_horse_armor" + }, + "group": "basemetals:nickel_horse_armor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/nickel_ingot_from_nuggets.json index 28383a38..4d1393dc 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_ingot_from_nuggets.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:nuggets/nickel" - } - }, - "result": { - "item": "basemetals:nickel_ingot" - }, - "group": "basemetals:nickel_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:nuggets/nickel" + } + }, + "result": { + "item": "basemetals:nickel_ingot" + }, + "group": "basemetals:nickel_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_leggings.json b/src/generated/resources/data/basemetals/recipes/nickel_leggings.json index 22fad47f..e7a4bb49 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_leggings.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/nickel" - } - }, - "result": { - "item": "basemetals:nickel_leggings" - }, - "group": "basemetals:nickel_leggings" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/nickel" + } + }, + "result": { + "item": "basemetals:nickel_leggings" + }, + "group": "basemetals:nickel_leggings" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_lever.json b/src/generated/resources/data/basemetals/recipes/nickel_lever.json index f769b036..de0e6f49 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_lever.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_lever.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "X" - ], - "key": { - "R": { - "tag": "forge:rods/nickel" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "X" + ], + "key": { + "R": { + "tag": "forge:rods/nickel" + }, + "X": { + "tag": "forge:ingots/nickel" + } }, - "X": { - "tag": "forge:ingots/nickel" - } - }, - "result": { - "item": "basemetals:nickel_lever" - }, - "group": "basemetals:nickel_lever" + "result": { + "item": "basemetals:nickel_lever" + }, + "group": "basemetals:nickel_lever" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_nuggets.json b/src/generated/resources/data/basemetals/recipes/nickel_nuggets.json index 75b0a6d0..3941b0ee 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_nuggets.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:ingots/nickel" - } - ], - "result": { - "item": "basemetals:nickel_nugget", - "count": 9 - }, - "group": "basemetals:nickel_nugget" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/nickel" + } + ], + "result": { + "item": "basemetals:nickel_nugget", + "count": 9 + }, + "group": "basemetals:nickel_nugget" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_pickaxe.json b/src/generated/resources/data/basemetals/recipes/nickel_pickaxe.json index 08ea5b2e..698aee60 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_pickaxe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " S ", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " S ", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/nickel" + } }, - "X": { - "tag": "forge:ingots/nickel" - } - }, - "result": { - "item": "basemetals:nickel_pickaxe" - }, - "group": "basemetals:nickel_pickaxe" + "result": { + "item": "basemetals:nickel_pickaxe" + }, + "group": "basemetals:nickel_pickaxe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_plate.json b/src/generated/resources/data/basemetals/recipes/nickel_plate.json index 46d411a2..0ad4b536 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_plate.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_plate.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/nickel" - } - }, - "result": { - "item": "basemetals:nickel_plate", - "count": 3 - }, - "group": "basemetals:nickel_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/nickel" + } + }, + "result": { + "item": "basemetals:nickel_plate", + "count": 3 + }, + "group": "basemetals:nickel_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/nickel_powder_from_small.json index 195bd287..fba7d324 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/nickel" - } - }, - "result": { - "item": "basemetals:nickel_powder" - }, - "group": "basemetals:nickel_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/nickel" + } + }, + "result": { + "item": "basemetals:nickel_powder" + }, + "group": "basemetals:nickel_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/nickel_pressure_plate.json index 0199b8d3..fd912890 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_pressure_plate.json @@ -1,15 +1,18 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/nickel" - } - }, - "result": { - "item": "basemetals:nickel_pressure_plate" - }, - "group": "basemetals:nickel_pressure_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/nickel" + } + }, + "result": { + "item": "basemetals:nickel_pressure_plate" + }, + "group": "basemetals:nickel_pressure_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_rod.json b/src/generated/resources/data/basemetals/recipes/nickel_rod.json index 429fbf75..5e6b1f5c 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_rod.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_rod.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:ingots/nickel" - } - }, - "result": { - "item": "basemetals:nickel_rod", - "count": 4 - }, - "group": "basemetals:nickel_rod" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:ingots/nickel" + } + }, + "result": { + "item": "basemetals:nickel_rod", + "count": 4 + }, + "group": "basemetals:nickel_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_scythe.json b/src/generated/resources/data/basemetals/recipes/nickel_scythe.json index eb966c85..68d65526 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/nickel" + } }, - "X": { - "tag": "forge:ingots/nickel" - } - }, - "result": { - "item": "basemetals:nickel_scythe" - }, - "group": "basemetals:nickel_scythe" + "result": { + "item": "basemetals:nickel_scythe" + }, + "group": "basemetals:nickel_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_shears.json b/src/generated/resources/data/basemetals/recipes/nickel_shears.json index f1a7876d..2f0de4fb 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_shears.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_shears.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "X " - ], - "key": { - "X": { - "tag": "forge:ingots/nickel" - } - }, - "result": { - "item": "basemetals:nickel_shears" - }, - "group": "basemetals:nickel_shears" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "X " + ], + "key": { + "X": { + "tag": "forge:ingots/nickel" + } + }, + "result": { + "item": "basemetals:nickel_shears" + }, + "group": "basemetals:nickel_shears" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_shield.json b/src/generated/resources/data/basemetals/recipes/nickel_shield.json index 24211de6..031f70f1 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_shield.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_shield.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XWX", - "XXX", - " X " - ], - "key": { - "W": { - "tag": "minecraft:planks" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XWX", + "XXX", + " X " + ], + "key": { + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:ingots/nickel" + } }, - "X": { - "tag": "forge:ingots/nickel" - } - }, - "result": { - "item": "basemetals:nickel_shield" - }, - "group": "basemetals:nickel_shield" + "result": { + "item": "basemetals:nickel_shield" + }, + "group": "basemetals:nickel_shield" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_shovel.json b/src/generated/resources/data/basemetals/recipes/nickel_shovel.json index da0d9994..bf62fe85 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_shovel.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/nickel" + } }, - "X": { - "tag": "forge:ingots/nickel" - } - }, - "result": { - "item": "basemetals:nickel_shovel" - }, - "group": "basemetals:nickel_shovel" + "result": { + "item": "basemetals:nickel_shovel" + }, + "group": "basemetals:nickel_shovel" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_slab.json b/src/generated/resources/data/basemetals/recipes/nickel_slab.json index 436c0a98..e78c0dec 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_slab.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_slab.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/nickel" - } - }, - "result": { - "item": "basemetals:nickel_slab", - "count": 6 - }, - "group": "basemetals:nickel_slab" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/nickel" + } + }, + "result": { + "item": "basemetals:nickel_slab", + "count": 6 + }, + "group": "basemetals:nickel_slab" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_smallpowder.json b/src/generated/resources/data/basemetals/recipes/nickel_smallpowder.json index eeb7c6f2..c7f0a075 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/nickel" - } - ], - "result": { - "item": "basemetals:nickel_smallpowder", - "count": 9 - }, - "group": "basemetals:nickel_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/nickel" + } + ], + "result": { + "item": "basemetals:nickel_smallpowder", + "count": 9 + }, + "group": "basemetals:nickel_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_stairs.json b/src/generated/resources/data/basemetals/recipes/nickel_stairs.json index de90548b..14a496f2 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_stairs.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X ", - "XX ", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/nickel" - } - }, - "result": { - "item": "basemetals:nickel_stairs", - "count": 4 - }, - "group": "basemetals:nickel_stairs" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/nickel" + } + }, + "result": { + "item": "basemetals:nickel_stairs", + "count": 4 + }, + "group": "basemetals:nickel_stairs" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_sword.json b/src/generated/resources/data/basemetals/recipes/nickel_sword.json index ae2223c1..e262b874 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_sword.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_sword.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/nickel" + } }, - "X": { - "tag": "forge:ingots/nickel" - } - }, - "result": { - "item": "basemetals:nickel_sword" - }, - "group": "basemetals:nickel_sword" + "result": { + "item": "basemetals:nickel_sword" + }, + "group": "basemetals:nickel_sword" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_trapdoor.json b/src/generated/resources/data/basemetals/recipes/nickel_trapdoor.json index 84b8062b..c3f327d3 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_trapdoor.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/nickel" - } - }, - "result": { - "item": "basemetals:nickel_trapdoor" - }, - "group": "basemetals:nickel_trapdoor" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/nickel" + } + }, + "result": { + "item": "basemetals:nickel_trapdoor" + }, + "group": "basemetals:nickel_trapdoor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/nickel_wall.json b/src/generated/resources/data/basemetals/recipes/nickel_wall.json index 77251316..91daa733 100644 --- a/src/generated/resources/data/basemetals/recipes/nickel_wall.json +++ b/src/generated/resources/data/basemetals/recipes/nickel_wall.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/nickel" - } - }, - "result": { - "item": "basemetals:nickel_wall", - "count": 6 - }, - "group": "basemetals:nickel_wall" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/nickel" + } + }, + "result": { + "item": "basemetals:nickel_wall", + "count": 6 + }, + "group": "basemetals:nickel_wall" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_arrow.json b/src/generated/resources/data/basemetals/recipes/obsidian_arrow.json index b147f6b5..b4fb690b 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_arrow.json @@ -1,24 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "N", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "N", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "N": { + "tag": "forge:nuggets/obsidian" + }, + "R": { + "tag": "forge:rods/obsidian" + } }, - "N": { - "tag": "forge:nuggets/obsidian" + "result": { + "item": "basemetals:obsidian_arrow", + "count": 4 }, - "R": { - "tag": "forge:rods/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_arrow", - "count": 4 - }, - "group": "basemetals:obsidian_arrow" + "group": "basemetals:obsidian_arrow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_axe.json b/src/generated/resources/data/basemetals/recipes/obsidian_axe.json index 5ffaec81..b758f4a6 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_axe.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_axe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XS", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XS", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/obsidian" + } }, - "X": { - "tag": "forge:ingots/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_axe" - }, - "group": "basemetals:obsidian_axe" + "result": { + "item": "basemetals:obsidian_axe" + }, + "group": "basemetals:obsidian_axe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_bars.json b/src/generated/resources/data/basemetals/recipes/obsidian_bars.json index a1f50112..df3ba71e 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_bars.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_bars.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_bars", - "count": 16 - }, - "group": "basemetals:obsidian_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/obsidian" + } + }, + "result": { + "item": "basemetals:obsidian_bars", + "count": 16 + }, + "group": "basemetals:obsidian_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_bars_2.json b/src/generated/resources/data/basemetals/recipes/obsidian_bars_2.json index 108db80e..b0abf415 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_bars_2.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:rods/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_bars", - "count": 4 - }, - "group": "basemetals:obsidian_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:rods/obsidian" + } + }, + "result": { + "item": "basemetals:obsidian_bars", + "count": 4 + }, + "group": "basemetals:obsidian_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_block.json b/src/generated/resources/data/basemetals/recipes/obsidian_block.json index e7e189e9..8692116c 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_block.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_block.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/obsidian" - } - }, - "result": { - "item": "minecraft:obsidian" - }, - "group": "minecraft:obsidian" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/obsidian" + } + }, + "result": { + "item": "minecraft:obsidian" + }, + "group": "minecraft:obsidian" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_bolt.json b/src/generated/resources/data/basemetals/recipes/obsidian_bolt.json index a442683e..74f191ec 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_bolt.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "R": { + "tag": "forge:rods/obsidian" + } }, - "R": { - "tag": "forge:rods/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_bolt", - "count": 4 - }, - "group": "basemetals:obsidian_bolt" + "result": { + "item": "basemetals:obsidian_bolt", + "count": 4 + }, + "group": "basemetals:obsidian_bolt" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_boots.json b/src/generated/resources/data/basemetals/recipes/obsidian_boots.json index 55c330d9..dd6b344e 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_boots.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_boots.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_boots" - }, - "group": "basemetals:obsidian_boots" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/obsidian" + } + }, + "result": { + "item": "basemetals:obsidian_boots" + }, + "group": "basemetals:obsidian_boots" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_bow.json b/src/generated/resources/data/basemetals/recipes/obsidian_bow.json index 1ed26b9f..6b6cb739 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_bow.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_bow.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " RS", - "R S", - " RS" - ], - "key": { - "R": { - "tag": "forge:rods/obsidian" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " RS", + "R S", + " RS" + ], + "key": { + "R": { + "tag": "forge:rods/obsidian" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:obsidian_bow" - }, - "group": "basemetals:obsidian_bow" + "result": { + "item": "basemetals:obsidian_bow" + }, + "group": "basemetals:obsidian_bow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_button.json b/src/generated/resources/data/basemetals/recipes/obsidian_button.json index 969988eb..f072d6bd 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_button.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_button.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:nuggets/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_button" - }, - "group": "basemetals:obsidian_button" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:nuggets/obsidian" + } + }, + "result": { + "item": "basemetals:obsidian_button" + }, + "group": "basemetals:obsidian_button" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_chestplate.json b/src/generated/resources/data/basemetals/recipes/obsidian_chestplate.json index c43dfa0e..5454f561 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_chestplate.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_chestplate" - }, - "group": "basemetals:obsidian_chestplate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/obsidian" + } + }, + "result": { + "item": "basemetals:obsidian_chestplate" + }, + "group": "basemetals:obsidian_chestplate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_crackhammer.json b/src/generated/resources/data/basemetals/recipes/obsidian_crackhammer.json index 541963a1..9ba6a6fa 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:storage_blocks/obsidian" + } }, - "X": { - "tag": "forge:storage_blocks/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_crackhammer" - }, - "group": "basemetals:obsidian_crackhammer" + "result": { + "item": "basemetals:obsidian_crackhammer" + }, + "group": "basemetals:obsidian_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_crossbow.json b/src/generated/resources/data/basemetals/recipes/obsidian_crossbow.json index e8e4400d..a43c103c 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_crossbow.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRR", - " SR", - "R G" - ], - "key": { - "G": { - "tag": "forge:gears/obsidian" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRR", + " SR", + "R G" + ], + "key": { + "G": { + "tag": "forge:gears/obsidian" + }, + "R": { + "tag": "forge:rods/obsidian" + }, + "S": { + "item": "minecraft:string" + } }, - "R": { - "tag": "forge:rods/obsidian" + "result": { + "item": "basemetals:obsidian_crossbow" }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:obsidian_crossbow" - }, - "group": "basemetals:obsidian_crossbow" + "group": "basemetals:obsidian_crossbow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_door.json b/src/generated/resources/data/basemetals/recipes/obsidian_door.json index 555a3e45..80df5de3 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_door.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_door.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_door", - "count": 3 - }, - "group": "basemetals:obsidian_door" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/obsidian" + } + }, + "result": { + "item": "basemetals:obsidian_door", + "count": 3 + }, + "group": "basemetals:obsidian_door" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_fishingrod.json b/src/generated/resources/data/basemetals/recipes/obsidian_fishingrod.json index 4624ce52..9b099c65 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_fishingrod.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " R", - " RS", - "R S" - ], - "key": { - "R": { - "tag": "forge:rods/obsidian" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " R", + " RS", + "R S" + ], + "key": { + "R": { + "tag": "forge:rods/obsidian" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:obsidian_fishing_rod" - }, - "group": "basemetals:obsidian_fishing_rod" + "result": { + "item": "basemetals:obsidian_fishing_rod" + }, + "group": "basemetals:obsidian_fishing_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_gear.json b/src/generated/resources/data/basemetals/recipes/obsidian_gear.json index 13b7d43f..45272781 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_gear.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_gear.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "XRX", - " X " - ], - "key": { - "R": { - "tag": "forge:rods/obsidian" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XRX", + " X " + ], + "key": { + "R": { + "tag": "forge:rods/obsidian" + }, + "X": { + "tag": "forge:ingots/obsidian" + } }, - "X": { - "tag": "forge:ingots/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_gear", - "count": 4 - }, - "group": "basemetals:obsidian_gear" + "result": { + "item": "basemetals:obsidian_gear", + "count": 4 + }, + "group": "basemetals:obsidian_gear" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_helmet.json b/src/generated/resources/data/basemetals/recipes/obsidian_helmet.json index be6b4106..9316710e 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_helmet.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_helmet" - }, - "group": "basemetals:obsidian_helmet" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/obsidian" + } + }, + "result": { + "item": "basemetals:obsidian_helmet" + }, + "group": "basemetals:obsidian_helmet" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_hoe.json b/src/generated/resources/data/basemetals/recipes/obsidian_hoe.json index b11bf0a4..a0178fd3 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_hoe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - " S", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " S", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/obsidian" + } }, - "X": { - "tag": "forge:ingots/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_hoe" - }, - "group": "basemetals:obsidian_hoe" + "result": { + "item": "basemetals:obsidian_hoe" + }, + "group": "basemetals:obsidian_hoe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_horsearmor.json b/src/generated/resources/data/basemetals/recipes/obsidian_horsearmor.json index 673ee5ff..86972b44 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_horsearmor.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "XWX", - "XXX" - ], - "key": { - "W": { - "tag": "minecraft:wool" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "XWX", + "XXX" + ], + "key": { + "W": { + "tag": "minecraft:wool" + }, + "X": { + "tag": "forge:ingots/obsidian" + } }, - "X": { - "tag": "forge:ingots/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_horse_armor" - }, - "group": "basemetals:obsidian_horse_armor" + "result": { + "item": "basemetals:obsidian_horse_armor" + }, + "group": "basemetals:obsidian_horse_armor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_ingot.json b/src/generated/resources/data/basemetals/recipes/obsidian_ingot.json index f52f6570..481795e8 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_ingot.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:nuggets/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_ingot" - }, - "group": "basemetals:obsidian_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:nuggets/obsidian" + } + }, + "result": { + "item": "basemetals:obsidian_ingot" + }, + "group": "basemetals:obsidian_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_leggings.json b/src/generated/resources/data/basemetals/recipes/obsidian_leggings.json index 8048df6c..d903562a 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_leggings.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_leggings" - }, - "group": "basemetals:obsidian_leggings" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/obsidian" + } + }, + "result": { + "item": "basemetals:obsidian_leggings" + }, + "group": "basemetals:obsidian_leggings" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_lever.json b/src/generated/resources/data/basemetals/recipes/obsidian_lever.json index 482546bd..0c89bab4 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_lever.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_lever.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "X" - ], - "key": { - "R": { - "tag": "forge:rods/obsidian" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "X" + ], + "key": { + "R": { + "tag": "forge:rods/obsidian" + }, + "X": { + "tag": "forge:ingots/obsidian" + } }, - "X": { - "tag": "forge:ingots/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_lever" - }, - "group": "basemetals:obsidian_lever" + "result": { + "item": "basemetals:obsidian_lever" + }, + "group": "basemetals:obsidian_lever" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_nugget.json b/src/generated/resources/data/basemetals/recipes/obsidian_nugget.json index 86130320..cce58e90 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_nugget.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_nugget.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:ingots/obsidian" - } - ], - "result": { - "item": "basemetals:obsidian_nugget", - "count": 9 - }, - "group": "basemetals:obsidian_nugget" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/obsidian" + } + ], + "result": { + "item": "basemetals:obsidian_nugget", + "count": 9 + }, + "group": "basemetals:obsidian_nugget" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_pickaxe.json b/src/generated/resources/data/basemetals/recipes/obsidian_pickaxe.json index 52fe09ed..1583c74a 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_pickaxe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " S ", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " S ", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/obsidian" + } }, - "X": { - "tag": "forge:ingots/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_pickaxe" - }, - "group": "basemetals:obsidian_pickaxe" + "result": { + "item": "basemetals:obsidian_pickaxe" + }, + "group": "basemetals:obsidian_pickaxe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/obsidian_powder_from_small.json index 7074ef75..e246a1b7 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_powder" - }, - "group": "basemetals:obsidian_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/obsidian" + } + }, + "result": { + "item": "basemetals:obsidian_powder" + }, + "group": "basemetals:obsidian_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/obsidian_pressure_plate.json index 945befc5..16d1f0ff 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_pressure_plate.json @@ -1,15 +1,18 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_pressure_plate" - }, - "group": "basemetals:obsidian_pressure_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/obsidian" + } + }, + "result": { + "item": "basemetals:obsidian_pressure_plate" + }, + "group": "basemetals:obsidian_pressure_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_rod.json b/src/generated/resources/data/basemetals/recipes/obsidian_rod.json index ec864d44..cdcdab63 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_rod.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_rod.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:ingots/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_rod", - "count": 4 - }, - "group": "basemetals:obsidian_rod" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:ingots/obsidian" + } + }, + "result": { + "item": "basemetals:obsidian_rod", + "count": 4 + }, + "group": "basemetals:obsidian_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_scythe.json b/src/generated/resources/data/basemetals/recipes/obsidian_scythe.json index 43ee39b3..ab309167 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:storage_blocks/obsidian" + } }, - "X": { - "tag": "forge:storage_blocks/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_scythe" - }, - "group": "basemetals:obsidian_scythe" + "result": { + "item": "basemetals:obsidian_scythe" + }, + "group": "basemetals:obsidian_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_shears.json b/src/generated/resources/data/basemetals/recipes/obsidian_shears.json index f1dee7e1..121fd792 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_shears.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_shears.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "X " - ], - "key": { - "X": { - "tag": "forge:ingots/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_shears" - }, - "group": "basemetals:obsidian_shears" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "X " + ], + "key": { + "X": { + "tag": "forge:ingots/obsidian" + } + }, + "result": { + "item": "basemetals:obsidian_shears" + }, + "group": "basemetals:obsidian_shears" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_shield.json b/src/generated/resources/data/basemetals/recipes/obsidian_shield.json index 006dc789..b0412b17 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_shield.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_shield.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XWX", - "XXX", - " X " - ], - "key": { - "W": { - "tag": "minecraft:planks" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XWX", + "XXX", + " X " + ], + "key": { + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:ingots/obsidian" + } }, - "X": { - "tag": "forge:ingots/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_shield" - }, - "group": "basemetals:obsidian_shield" + "result": { + "item": "basemetals:obsidian_shield" + }, + "group": "basemetals:obsidian_shield" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_shovel.json b/src/generated/resources/data/basemetals/recipes/obsidian_shovel.json index f3d24bdc..51842526 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_shovel.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/obsidian" + } }, - "X": { - "tag": "forge:ingots/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_shovel" - }, - "group": "basemetals:obsidian_shovel" + "result": { + "item": "basemetals:obsidian_shovel" + }, + "group": "basemetals:obsidian_shovel" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_slab.json b/src/generated/resources/data/basemetals/recipes/obsidian_slab.json index 30b49cae..f5a923ca 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_slab.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_slab.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_slab", - "count": 6 - }, - "group": "basemetals:obsidian_slab" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/obsidian" + } + }, + "result": { + "item": "basemetals:obsidian_slab", + "count": 6 + }, + "group": "basemetals:obsidian_slab" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_smallpowder.json b/src/generated/resources/data/basemetals/recipes/obsidian_smallpowder.json index feec615b..4f9e1f66 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/obsidian" - } - ], - "result": { - "item": "basemetals:obsidian_smallpowder", - "count": 9 - }, - "group": "basemetals:obsidian_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/obsidian" + } + ], + "result": { + "item": "basemetals:obsidian_smallpowder", + "count": 9 + }, + "group": "basemetals:obsidian_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_stairs.json b/src/generated/resources/data/basemetals/recipes/obsidian_stairs.json index 1b904227..e06c4599 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_stairs.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X ", - "XX ", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_stairs", - "count": 4 - }, - "group": "basemetals:obsidian_stairs" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/obsidian" + } + }, + "result": { + "item": "basemetals:obsidian_stairs", + "count": 4 + }, + "group": "basemetals:obsidian_stairs" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_sword.json b/src/generated/resources/data/basemetals/recipes/obsidian_sword.json index 17df3885..9ca2fe69 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_sword.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_sword.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/obsidian" + } }, - "X": { - "tag": "forge:ingots/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_sword" - }, - "group": "basemetals:obsidian_sword" + "result": { + "item": "basemetals:obsidian_sword" + }, + "group": "basemetals:obsidian_sword" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_trapdoor.json b/src/generated/resources/data/basemetals/recipes/obsidian_trapdoor.json index d8c53377..34b58ccf 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_trapdoor.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_trapdoor" - }, - "group": "basemetals:obsidian_trapdoor" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/obsidian" + } + }, + "result": { + "item": "basemetals:obsidian_trapdoor" + }, + "group": "basemetals:obsidian_trapdoor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/obsidian_wall.json b/src/generated/resources/data/basemetals/recipes/obsidian_wall.json index 600a3552..8de6e8e1 100644 --- a/src/generated/resources/data/basemetals/recipes/obsidian_wall.json +++ b/src/generated/resources/data/basemetals/recipes/obsidian_wall.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/obsidian" - } - }, - "result": { - "item": "basemetals:obsidian_wall", - "count": 6 - }, - "group": "basemetals:obsidian_wall" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/obsidian" + } + }, + "result": { + "item": "basemetals:obsidian_wall", + "count": 6 + }, + "group": "basemetals:obsidian_wall" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_arrow.json b/src/generated/resources/data/basemetals/recipes/pewter_arrow.json index 8edee25c..f5a15e58 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_arrow.json @@ -1,24 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "N", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "N", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "N": { + "tag": "forge:nuggets/pewter" + }, + "R": { + "tag": "forge:rods/pewter" + } }, - "N": { - "tag": "forge:nuggets/pewter" + "result": { + "item": "basemetals:pewter_arrow", + "count": 4 }, - "R": { - "tag": "forge:rods/pewter" - } - }, - "result": { - "item": "basemetals:pewter_arrow", - "count": 4 - }, - "group": "basemetals:pewter_arrow" + "group": "basemetals:pewter_arrow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_axe.json b/src/generated/resources/data/basemetals/recipes/pewter_axe.json index b870e623..3a25cc78 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_axe.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_axe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XS", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XS", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/pewter" + } }, - "X": { - "tag": "forge:ingots/pewter" - } - }, - "result": { - "item": "basemetals:pewter_axe" - }, - "group": "basemetals:pewter_axe" + "result": { + "item": "basemetals:pewter_axe" + }, + "group": "basemetals:pewter_axe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_bars.json b/src/generated/resources/data/basemetals/recipes/pewter_bars.json index 52790cb6..79cb0d23 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_bars.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_bars.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/pewter" - } - }, - "result": { - "item": "basemetals:pewter_bars", - "count": 16 - }, - "group": "basemetals:pewter_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/pewter" + } + }, + "result": { + "item": "basemetals:pewter_bars", + "count": 16 + }, + "group": "basemetals:pewter_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_bars_2.json b/src/generated/resources/data/basemetals/recipes/pewter_bars_2.json index 2914bed4..b976e8f5 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_bars_2.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:rods/pewter" - } - }, - "result": { - "item": "basemetals:pewter_bars", - "count": 4 - }, - "group": "basemetals:pewter_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:rods/pewter" + } + }, + "result": { + "item": "basemetals:pewter_bars", + "count": 4 + }, + "group": "basemetals:pewter_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_blend.json b/src/generated/resources/data/basemetals/recipes/pewter_blend.json index 688eda83..0e38db95 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_blend.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_blend.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/tin" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/tin" + }, + { + "tag": "forge:dusts/copper" + }, + { + "tag": "forge:dusts/lead" + } + ], + "result": { + "item": "basemetals:pewter_blend", + "count": 3 }, - { - "tag": "forge:dusts/copper" - }, - { - "tag": "forge:dusts/lead" - } - ], - "result": { - "item": "basemetals:pewter_blend", - "count": 3 - }, - "group": "basemetals:pewter_blend" + "group": "basemetals:pewter_blend" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_blend_from_small.json b/src/generated/resources/data/basemetals/recipes/pewter_blend_from_small.json index 14c4d39f..291e4658 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_blend_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_blend_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:small_blends/pewter" - } - }, - "result": { - "item": "basemetals:pewter_blend" - }, - "group": "basemetals:pewter_blend" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:small_blends/pewter" + } + }, + "result": { + "item": "basemetals:pewter_blend" + }, + "group": "basemetals:pewter_blend" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_block.json b/src/generated/resources/data/basemetals/recipes/pewter_block.json index 3ef9dc5a..6b1e276f 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_block.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_block.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/pewter" - } - }, - "result": { - "item": "basemetals:pewter_block" - }, - "group": "basemetals:pewter_block" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/pewter" + } + }, + "result": { + "item": "basemetals:pewter_block" + }, + "group": "basemetals:pewter_block" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_block_ingot.json b/src/generated/resources/data/basemetals/recipes/pewter_block_ingot.json index ed5a27b2..8a553607 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_block_ingot.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/pewter" - } - ], - "result": { - "item": "basemetals:pewter_ingot", - "count": 9 - }, - "group": "basemetals:pewter_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/pewter" + } + ], + "result": { + "item": "basemetals:pewter_ingot", + "count": 9 + }, + "group": "basemetals:pewter_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_bolt.json b/src/generated/resources/data/basemetals/recipes/pewter_bolt.json index 9b2d99ac..145237ff 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_bolt.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "R": { + "tag": "forge:rods/pewter" + } }, - "R": { - "tag": "forge:rods/pewter" - } - }, - "result": { - "item": "basemetals:pewter_bolt", - "count": 4 - }, - "group": "basemetals:pewter_bolt" + "result": { + "item": "basemetals:pewter_bolt", + "count": 4 + }, + "group": "basemetals:pewter_bolt" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_boots.json b/src/generated/resources/data/basemetals/recipes/pewter_boots.json index 25a224b2..c5b576fb 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_boots.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_boots.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/pewter" - } - }, - "result": { - "item": "basemetals:pewter_boots" - }, - "group": "basemetals:pewter_boots" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/pewter" + } + }, + "result": { + "item": "basemetals:pewter_boots" + }, + "group": "basemetals:pewter_boots" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_bow.json b/src/generated/resources/data/basemetals/recipes/pewter_bow.json index ef63ea1e..534bbd4c 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_bow.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_bow.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " RS", - "R S", - " RS" - ], - "key": { - "R": { - "tag": "forge:rods/pewter" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " RS", + "R S", + " RS" + ], + "key": { + "R": { + "tag": "forge:rods/pewter" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:pewter_bow" - }, - "group": "basemetals:pewter_bow" + "result": { + "item": "basemetals:pewter_bow" + }, + "group": "basemetals:pewter_bow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_button.json b/src/generated/resources/data/basemetals/recipes/pewter_button.json index ab36aabc..6220dd9a 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_button.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_button.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:nuggets/pewter" - } - }, - "result": { - "item": "basemetals:pewter_button" - }, - "group": "basemetals:pewter_button" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:nuggets/pewter" + } + }, + "result": { + "item": "basemetals:pewter_button" + }, + "group": "basemetals:pewter_button" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_chestplate.json b/src/generated/resources/data/basemetals/recipes/pewter_chestplate.json index be9284f9..74f331ba 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_chestplate.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/pewter" - } - }, - "result": { - "item": "basemetals:pewter_chestplate" - }, - "group": "basemetals:pewter_chestplate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/pewter" + } + }, + "result": { + "item": "basemetals:pewter_chestplate" + }, + "group": "basemetals:pewter_chestplate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_crackhammer.json b/src/generated/resources/data/basemetals/recipes/pewter_crackhammer.json index 3b67ee3a..b7b8ad62 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:storage_blocks/pewter" + } }, - "X": { - "tag": "forge:storage_blocks/pewter" - } - }, - "result": { - "item": "basemetals:pewter_crackhammer" - }, - "group": "basemetals:pewter_crackhammer" + "result": { + "item": "basemetals:pewter_crackhammer" + }, + "group": "basemetals:pewter_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_crossbow.json b/src/generated/resources/data/basemetals/recipes/pewter_crossbow.json index f1308e4b..3567bf91 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_crossbow.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRR", - " SR", - "R G" - ], - "key": { - "G": { - "tag": "forge:gears/pewter" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRR", + " SR", + "R G" + ], + "key": { + "G": { + "tag": "forge:gears/pewter" + }, + "R": { + "tag": "forge:rods/pewter" + }, + "S": { + "item": "minecraft:string" + } }, - "R": { - "tag": "forge:rods/pewter" + "result": { + "item": "basemetals:pewter_crossbow" }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:pewter_crossbow" - }, - "group": "basemetals:pewter_crossbow" + "group": "basemetals:pewter_crossbow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_door.json b/src/generated/resources/data/basemetals/recipes/pewter_door.json index 96f2486f..c1ec75ec 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_door.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_door.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/pewter" - } - }, - "result": { - "item": "basemetals:pewter_door", - "count": 3 - }, - "group": "basemetals:pewter_door" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/pewter" + } + }, + "result": { + "item": "basemetals:pewter_door", + "count": 3 + }, + "group": "basemetals:pewter_door" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_fishingrod.json b/src/generated/resources/data/basemetals/recipes/pewter_fishingrod.json index 6609d349..d807d062 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_fishingrod.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " R", - " RS", - "R S" - ], - "key": { - "R": { - "tag": "forge:rods/pewter" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " R", + " RS", + "R S" + ], + "key": { + "R": { + "tag": "forge:rods/pewter" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:pewter_fishing_rod" - }, - "group": "basemetals:pewter_fishing_rod" + "result": { + "item": "basemetals:pewter_fishing_rod" + }, + "group": "basemetals:pewter_fishing_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_gear.json b/src/generated/resources/data/basemetals/recipes/pewter_gear.json index e9d29a6d..b19f57ed 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_gear.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_gear.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "XRX", - " X " - ], - "key": { - "R": { - "tag": "forge:rods/pewter" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XRX", + " X " + ], + "key": { + "R": { + "tag": "forge:rods/pewter" + }, + "X": { + "tag": "forge:ingots/pewter" + } }, - "X": { - "tag": "forge:ingots/pewter" - } - }, - "result": { - "item": "basemetals:pewter_gear", - "count": 4 - }, - "group": "basemetals:pewter_gear" + "result": { + "item": "basemetals:pewter_gear", + "count": 4 + }, + "group": "basemetals:pewter_gear" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_helmet.json b/src/generated/resources/data/basemetals/recipes/pewter_helmet.json index b4c1c7d4..946ac933 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_helmet.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/pewter" - } - }, - "result": { - "item": "basemetals:pewter_helmet" - }, - "group": "basemetals:pewter_helmet" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/pewter" + } + }, + "result": { + "item": "basemetals:pewter_helmet" + }, + "group": "basemetals:pewter_helmet" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_hoe.json b/src/generated/resources/data/basemetals/recipes/pewter_hoe.json index 7aab0b45..e0853901 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_hoe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - " S", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " S", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/pewter" + } }, - "X": { - "tag": "forge:ingots/pewter" - } - }, - "result": { - "item": "basemetals:pewter_hoe" - }, - "group": "basemetals:pewter_hoe" + "result": { + "item": "basemetals:pewter_hoe" + }, + "group": "basemetals:pewter_hoe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_horsearmor.json b/src/generated/resources/data/basemetals/recipes/pewter_horsearmor.json index 55b01958..67a11f43 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_horsearmor.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "XWX", - "XXX" - ], - "key": { - "W": { - "tag": "minecraft:wool" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "XWX", + "XXX" + ], + "key": { + "W": { + "tag": "minecraft:wool" + }, + "X": { + "tag": "forge:ingots/pewter" + } }, - "X": { - "tag": "forge:ingots/pewter" - } - }, - "result": { - "item": "basemetals:pewter_horse_armor" - }, - "group": "basemetals:pewter_horse_armor" + "result": { + "item": "basemetals:pewter_horse_armor" + }, + "group": "basemetals:pewter_horse_armor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/pewter_ingot_from_nuggets.json index d3aeb287..6bf480a3 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_ingot_from_nuggets.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:nuggets/pewter" - } - }, - "result": { - "item": "basemetals:pewter_ingot" - }, - "group": "basemetals:pewter_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:nuggets/pewter" + } + }, + "result": { + "item": "basemetals:pewter_ingot" + }, + "group": "basemetals:pewter_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_leggings.json b/src/generated/resources/data/basemetals/recipes/pewter_leggings.json index 1cce660c..f749ebfa 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_leggings.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/pewter" - } - }, - "result": { - "item": "basemetals:pewter_leggings" - }, - "group": "basemetals:pewter_leggings" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/pewter" + } + }, + "result": { + "item": "basemetals:pewter_leggings" + }, + "group": "basemetals:pewter_leggings" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_lever.json b/src/generated/resources/data/basemetals/recipes/pewter_lever.json index 4c993d68..c11bb8d1 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_lever.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_lever.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "X" - ], - "key": { - "R": { - "tag": "forge:rods/pewter" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "X" + ], + "key": { + "R": { + "tag": "forge:rods/pewter" + }, + "X": { + "tag": "forge:ingots/pewter" + } }, - "X": { - "tag": "forge:ingots/pewter" - } - }, - "result": { - "item": "basemetals:pewter_lever" - }, - "group": "basemetals:pewter_lever" + "result": { + "item": "basemetals:pewter_lever" + }, + "group": "basemetals:pewter_lever" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_nuggets.json b/src/generated/resources/data/basemetals/recipes/pewter_nuggets.json index 5144c9a9..2a579733 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_nuggets.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:ingots/pewter" - } - ], - "result": { - "item": "basemetals:pewter_nugget", - "count": 9 - }, - "group": "basemetals:pewter_nugget" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/pewter" + } + ], + "result": { + "item": "basemetals:pewter_nugget", + "count": 9 + }, + "group": "basemetals:pewter_nugget" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_pickaxe.json b/src/generated/resources/data/basemetals/recipes/pewter_pickaxe.json index 0d050160..a6b911e3 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_pickaxe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " S ", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " S ", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/pewter" + } }, - "X": { - "tag": "forge:ingots/pewter" - } - }, - "result": { - "item": "basemetals:pewter_pickaxe" - }, - "group": "basemetals:pewter_pickaxe" + "result": { + "item": "basemetals:pewter_pickaxe" + }, + "group": "basemetals:pewter_pickaxe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_plate.json b/src/generated/resources/data/basemetals/recipes/pewter_plate.json index c037415e..e84ba2cb 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_plate.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_plate.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/pewter" - } - }, - "result": { - "item": "basemetals:pewter_plate", - "count": 3 - }, - "group": "basemetals:pewter_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/pewter" + } + }, + "result": { + "item": "basemetals:pewter_plate", + "count": 3 + }, + "group": "basemetals:pewter_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/pewter_powder_from_small.json index c41c0095..b3bfebaf 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/pewter" - } - }, - "result": { - "item": "basemetals:pewter_powder" - }, - "group": "basemetals:pewter_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/pewter" + } + }, + "result": { + "item": "basemetals:pewter_powder" + }, + "group": "basemetals:pewter_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/pewter_pressure_plate.json index 9b1b9db2..e455ac1b 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_pressure_plate.json @@ -1,15 +1,18 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/pewter" - } - }, - "result": { - "item": "basemetals:pewter_pressure_plate" - }, - "group": "basemetals:pewter_pressure_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/pewter" + } + }, + "result": { + "item": "basemetals:pewter_pressure_plate" + }, + "group": "basemetals:pewter_pressure_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_rod.json b/src/generated/resources/data/basemetals/recipes/pewter_rod.json index 434c6a25..10816b83 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_rod.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_rod.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:ingots/pewter" - } - }, - "result": { - "item": "basemetals:pewter_rod", - "count": 4 - }, - "group": "basemetals:pewter_rod" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:ingots/pewter" + } + }, + "result": { + "item": "basemetals:pewter_rod", + "count": 4 + }, + "group": "basemetals:pewter_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_scythe.json b/src/generated/resources/data/basemetals/recipes/pewter_scythe.json index 2de79fb5..b05c130a 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/pewter" + } }, - "X": { - "tag": "forge:ingots/pewter" - } - }, - "result": { - "item": "basemetals:pewter_scythe" - }, - "group": "basemetals:pewter_scythe" + "result": { + "item": "basemetals:pewter_scythe" + }, + "group": "basemetals:pewter_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_shears.json b/src/generated/resources/data/basemetals/recipes/pewter_shears.json index 3c8b45a3..5e761ea5 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_shears.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_shears.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "X " - ], - "key": { - "X": { - "tag": "forge:ingots/pewter" - } - }, - "result": { - "item": "basemetals:pewter_shears" - }, - "group": "basemetals:pewter_shears" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "X " + ], + "key": { + "X": { + "tag": "forge:ingots/pewter" + } + }, + "result": { + "item": "basemetals:pewter_shears" + }, + "group": "basemetals:pewter_shears" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_shield.json b/src/generated/resources/data/basemetals/recipes/pewter_shield.json index e4cd4fd4..06b14b86 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_shield.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_shield.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XWX", - "XXX", - " X " - ], - "key": { - "W": { - "tag": "minecraft:planks" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XWX", + "XXX", + " X " + ], + "key": { + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:ingots/pewter" + } }, - "X": { - "tag": "forge:ingots/pewter" - } - }, - "result": { - "item": "basemetals:pewter_shield" - }, - "group": "basemetals:pewter_shield" + "result": { + "item": "basemetals:pewter_shield" + }, + "group": "basemetals:pewter_shield" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_shovel.json b/src/generated/resources/data/basemetals/recipes/pewter_shovel.json index 40c4bf1f..7294438d 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_shovel.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/pewter" + } }, - "X": { - "tag": "forge:ingots/pewter" - } - }, - "result": { - "item": "basemetals:pewter_shovel" - }, - "group": "basemetals:pewter_shovel" + "result": { + "item": "basemetals:pewter_shovel" + }, + "group": "basemetals:pewter_shovel" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_slab.json b/src/generated/resources/data/basemetals/recipes/pewter_slab.json index d47c162d..6c467f55 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_slab.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_slab.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/pewter" - } - }, - "result": { - "item": "basemetals:pewter_slab", - "count": 6 - }, - "group": "basemetals:pewter_slab" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/pewter" + } + }, + "result": { + "item": "basemetals:pewter_slab", + "count": 6 + }, + "group": "basemetals:pewter_slab" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_smallblend.json b/src/generated/resources/data/basemetals/recipes/pewter_smallblend.json index b9846f76..781b1cd2 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_smallblend.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_smallblend.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:blends/pewter" - } - ], - "result": { - "item": "basemetals:pewter_smallblend", - "count": 9 - }, - "group": "basemetals:pewter_smallblend" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:blends/pewter" + } + ], + "result": { + "item": "basemetals:pewter_smallblend", + "count": 9 + }, + "group": "basemetals:pewter_smallblend" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_smallpowder.json b/src/generated/resources/data/basemetals/recipes/pewter_smallpowder.json index 2056bf3a..c7cbf6c0 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/pewter" - } - ], - "result": { - "item": "basemetals:pewter_smallpowder", - "count": 9 - }, - "group": "basemetals:pewter_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/pewter" + } + ], + "result": { + "item": "basemetals:pewter_smallpowder", + "count": 9 + }, + "group": "basemetals:pewter_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_stairs.json b/src/generated/resources/data/basemetals/recipes/pewter_stairs.json index bc700f7d..d50f7b18 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_stairs.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X ", - "XX ", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/pewter" - } - }, - "result": { - "item": "basemetals:pewter_stairs", - "count": 4 - }, - "group": "basemetals:pewter_stairs" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/pewter" + } + }, + "result": { + "item": "basemetals:pewter_stairs", + "count": 4 + }, + "group": "basemetals:pewter_stairs" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_sword.json b/src/generated/resources/data/basemetals/recipes/pewter_sword.json index 7cf4e1ae..4535d696 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_sword.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_sword.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/pewter" + } }, - "X": { - "tag": "forge:ingots/pewter" - } - }, - "result": { - "item": "basemetals:pewter_sword" - }, - "group": "basemetals:pewter_sword" + "result": { + "item": "basemetals:pewter_sword" + }, + "group": "basemetals:pewter_sword" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_trapdoor.json b/src/generated/resources/data/basemetals/recipes/pewter_trapdoor.json index 57454223..80f702c8 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_trapdoor.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/pewter" - } - }, - "result": { - "item": "basemetals:pewter_trapdoor" - }, - "group": "basemetals:pewter_trapdoor" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/pewter" + } + }, + "result": { + "item": "basemetals:pewter_trapdoor" + }, + "group": "basemetals:pewter_trapdoor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/pewter_wall.json b/src/generated/resources/data/basemetals/recipes/pewter_wall.json index ce3b86cf..dd8117f5 100644 --- a/src/generated/resources/data/basemetals/recipes/pewter_wall.json +++ b/src/generated/resources/data/basemetals/recipes/pewter_wall.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/pewter" - } - }, - "result": { - "item": "basemetals:pewter_wall", - "count": 6 - }, - "group": "basemetals:pewter_wall" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/pewter" + } + }, + "result": { + "item": "basemetals:pewter_wall", + "count": 6 + }, + "group": "basemetals:pewter_wall" + } } diff --git a/src/generated/resources/data/basemetals/recipes/piston.json b/src/generated/resources/data/basemetals/recipes/piston.json index 5ef0ca16..3aafe5cd 100644 --- a/src/generated/resources/data/basemetals/recipes/piston.json +++ b/src/generated/resources/data/basemetals/recipes/piston.json @@ -1,26 +1,29 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "WWW", - "CXC", - "CRC" - ], - "key": { - "C": { - "tag": "forge:cobblestone" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "WWW", + "CXC", + "CRC" + ], + "key": { + "C": { + "tag": "forge:cobblestone" + }, + "R": { + "tag": "forge:dusts/redstone" + }, + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:ingots/steel" + } }, - "R": { - "tag": "forge:dusts/redstone" + "result": { + "item": "minecraft:piston" }, - "W": { - "tag": "minecraft:planks" - }, - "X": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "minecraft:piston" - }, - "group": "minecraft:piston" + "group": "minecraft:piston" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_arrow.json b/src/generated/resources/data/basemetals/recipes/platinum_arrow.json index c817de94..d316b10a 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_arrow.json @@ -1,24 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "N", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "N", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "N": { + "tag": "forge:nuggets/platinum" + }, + "R": { + "tag": "forge:rods/platinum" + } }, - "N": { - "tag": "forge:nuggets/platinum" + "result": { + "item": "basemetals:platinum_arrow", + "count": 4 }, - "R": { - "tag": "forge:rods/platinum" - } - }, - "result": { - "item": "basemetals:platinum_arrow", - "count": 4 - }, - "group": "basemetals:platinum_arrow" + "group": "basemetals:platinum_arrow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_axe.json b/src/generated/resources/data/basemetals/recipes/platinum_axe.json index 5e6744fd..f51bdfc8 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_axe.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_axe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XS", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XS", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/platinum" + } }, - "X": { - "tag": "forge:ingots/platinum" - } - }, - "result": { - "item": "basemetals:platinum_axe" - }, - "group": "basemetals:platinum_axe" + "result": { + "item": "basemetals:platinum_axe" + }, + "group": "basemetals:platinum_axe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_bars.json b/src/generated/resources/data/basemetals/recipes/platinum_bars.json index 57ad7edd..5c0a5268 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_bars.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_bars.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/platinum" - } - }, - "result": { - "item": "basemetals:platinum_bars", - "count": 16 - }, - "group": "basemetals:platinum_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/platinum" + } + }, + "result": { + "item": "basemetals:platinum_bars", + "count": 16 + }, + "group": "basemetals:platinum_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_bars_2.json b/src/generated/resources/data/basemetals/recipes/platinum_bars_2.json index 6a11fb41..4f5e0a7b 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_bars_2.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:rods/platinum" - } - }, - "result": { - "item": "basemetals:platinum_bars", - "count": 4 - }, - "group": "basemetals:platinum_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:rods/platinum" + } + }, + "result": { + "item": "basemetals:platinum_bars", + "count": 4 + }, + "group": "basemetals:platinum_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_block.json b/src/generated/resources/data/basemetals/recipes/platinum_block.json index 21c42ddc..c779425b 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_block.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_block.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/platinum" - } - }, - "result": { - "item": "basemetals:platinum_block" - }, - "group": "basemetals:platinum_block" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/platinum" + } + }, + "result": { + "item": "basemetals:platinum_block" + }, + "group": "basemetals:platinum_block" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_block_ingot.json b/src/generated/resources/data/basemetals/recipes/platinum_block_ingot.json index e04782db..b4400b62 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_block_ingot.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/platinum" - } - ], - "result": { - "item": "basemetals:platinum_ingot", - "count": 9 - }, - "group": "basemetals:platinum_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/platinum" + } + ], + "result": { + "item": "basemetals:platinum_ingot", + "count": 9 + }, + "group": "basemetals:platinum_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_bolt.json b/src/generated/resources/data/basemetals/recipes/platinum_bolt.json index 3e2c3d81..f579ef47 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_bolt.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "R": { + "tag": "forge:rods/platinum" + } }, - "R": { - "tag": "forge:rods/platinum" - } - }, - "result": { - "item": "basemetals:platinum_bolt", - "count": 4 - }, - "group": "basemetals:platinum_bolt" + "result": { + "item": "basemetals:platinum_bolt", + "count": 4 + }, + "group": "basemetals:platinum_bolt" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_boots.json b/src/generated/resources/data/basemetals/recipes/platinum_boots.json index 6f979709..9513f146 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_boots.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_boots.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/platinum" - } - }, - "result": { - "item": "basemetals:platinum_boots" - }, - "group": "basemetals:platinum_boots" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/platinum" + } + }, + "result": { + "item": "basemetals:platinum_boots" + }, + "group": "basemetals:platinum_boots" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_bow.json b/src/generated/resources/data/basemetals/recipes/platinum_bow.json index e8c17cc0..7a60fc14 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_bow.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_bow.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " RS", - "R S", - " RS" - ], - "key": { - "R": { - "tag": "forge:rods/platinum" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " RS", + "R S", + " RS" + ], + "key": { + "R": { + "tag": "forge:rods/platinum" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:platinum_bow" - }, - "group": "basemetals:platinum_bow" + "result": { + "item": "basemetals:platinum_bow" + }, + "group": "basemetals:platinum_bow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_button.json b/src/generated/resources/data/basemetals/recipes/platinum_button.json index c13b32ae..295c95da 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_button.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_button.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:nuggets/platinum" - } - }, - "result": { - "item": "basemetals:platinum_button" - }, - "group": "basemetals:platinum_button" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:nuggets/platinum" + } + }, + "result": { + "item": "basemetals:platinum_button" + }, + "group": "basemetals:platinum_button" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_chestplate.json b/src/generated/resources/data/basemetals/recipes/platinum_chestplate.json index aa578aec..fae819f8 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_chestplate.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/platinum" - } - }, - "result": { - "item": "basemetals:platinum_chestplate" - }, - "group": "basemetals:platinum_chestplate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/platinum" + } + }, + "result": { + "item": "basemetals:platinum_chestplate" + }, + "group": "basemetals:platinum_chestplate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_crackhammer.json b/src/generated/resources/data/basemetals/recipes/platinum_crackhammer.json index 2c4a6ead..3a471a80 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:storage_blocks/platinum" + } }, - "X": { - "tag": "forge:storage_blocks/platinum" - } - }, - "result": { - "item": "basemetals:platinum_crackhammer" - }, - "group": "basemetals:platinum_crackhammer" + "result": { + "item": "basemetals:platinum_crackhammer" + }, + "group": "basemetals:platinum_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_crossbow.json b/src/generated/resources/data/basemetals/recipes/platinum_crossbow.json index 024ff748..d5bf286a 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_crossbow.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRR", - " SR", - "R G" - ], - "key": { - "G": { - "tag": "forge:gears/platinum" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRR", + " SR", + "R G" + ], + "key": { + "G": { + "tag": "forge:gears/platinum" + }, + "R": { + "tag": "forge:rods/platinum" + }, + "S": { + "item": "minecraft:string" + } }, - "R": { - "tag": "forge:rods/platinum" + "result": { + "item": "basemetals:platinum_crossbow" }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:platinum_crossbow" - }, - "group": "basemetals:platinum_crossbow" + "group": "basemetals:platinum_crossbow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_door.json b/src/generated/resources/data/basemetals/recipes/platinum_door.json index 177c61a8..da27edd0 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_door.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_door.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/platinum" - } - }, - "result": { - "item": "basemetals:platinum_door", - "count": 3 - }, - "group": "basemetals:platinum_door" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/platinum" + } + }, + "result": { + "item": "basemetals:platinum_door", + "count": 3 + }, + "group": "basemetals:platinum_door" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_fishingrod.json b/src/generated/resources/data/basemetals/recipes/platinum_fishingrod.json index 3469f741..91aa5f87 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_fishingrod.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " R", - " RS", - "R S" - ], - "key": { - "R": { - "tag": "forge:rods/platinum" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " R", + " RS", + "R S" + ], + "key": { + "R": { + "tag": "forge:rods/platinum" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:platinum_fishing_rod" - }, - "group": "basemetals:platinum_fishing_rod" + "result": { + "item": "basemetals:platinum_fishing_rod" + }, + "group": "basemetals:platinum_fishing_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_gear.json b/src/generated/resources/data/basemetals/recipes/platinum_gear.json index ab5e6879..6955e876 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_gear.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_gear.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "XRX", - " X " - ], - "key": { - "R": { - "tag": "forge:rods/platinum" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XRX", + " X " + ], + "key": { + "R": { + "tag": "forge:rods/platinum" + }, + "X": { + "tag": "forge:ingots/platinum" + } }, - "X": { - "tag": "forge:ingots/platinum" - } - }, - "result": { - "item": "basemetals:platinum_gear", - "count": 4 - }, - "group": "basemetals:platinum_gear" + "result": { + "item": "basemetals:platinum_gear", + "count": 4 + }, + "group": "basemetals:platinum_gear" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_helmet.json b/src/generated/resources/data/basemetals/recipes/platinum_helmet.json index daa3e10c..22982021 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_helmet.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/platinum" - } - }, - "result": { - "item": "basemetals:platinum_helmet" - }, - "group": "basemetals:platinum_helmet" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/platinum" + } + }, + "result": { + "item": "basemetals:platinum_helmet" + }, + "group": "basemetals:platinum_helmet" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_hoe.json b/src/generated/resources/data/basemetals/recipes/platinum_hoe.json index cd6d63dd..a0d20e41 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_hoe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - " S", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " S", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/platinum" + } }, - "X": { - "tag": "forge:ingots/platinum" - } - }, - "result": { - "item": "basemetals:platinum_hoe" - }, - "group": "basemetals:platinum_hoe" + "result": { + "item": "basemetals:platinum_hoe" + }, + "group": "basemetals:platinum_hoe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_horsearmor.json b/src/generated/resources/data/basemetals/recipes/platinum_horsearmor.json index 72a33d30..776246a1 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_horsearmor.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "XWX", - "XXX" - ], - "key": { - "W": { - "tag": "minecraft:wool" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "XWX", + "XXX" + ], + "key": { + "W": { + "tag": "minecraft:wool" + }, + "X": { + "tag": "forge:ingots/platinum" + } }, - "X": { - "tag": "forge:ingots/platinum" - } - }, - "result": { - "item": "basemetals:platinum_horse_armor" - }, - "group": "basemetals:platinum_horse_armor" + "result": { + "item": "basemetals:platinum_horse_armor" + }, + "group": "basemetals:platinum_horse_armor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/platinum_ingot_from_nuggets.json index 44c875e1..f555b2ff 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_ingot_from_nuggets.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:nuggets/platinum" - } - }, - "result": { - "item": "basemetals:platinum_ingot" - }, - "group": "basemetals:platinum_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:nuggets/platinum" + } + }, + "result": { + "item": "basemetals:platinum_ingot" + }, + "group": "basemetals:platinum_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_leggings.json b/src/generated/resources/data/basemetals/recipes/platinum_leggings.json index 90ce404d..f290425d 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_leggings.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/platinum" - } - }, - "result": { - "item": "basemetals:platinum_leggings" - }, - "group": "basemetals:platinum_leggings" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/platinum" + } + }, + "result": { + "item": "basemetals:platinum_leggings" + }, + "group": "basemetals:platinum_leggings" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_lever.json b/src/generated/resources/data/basemetals/recipes/platinum_lever.json index 73774d64..8d7cc32d 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_lever.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_lever.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "X" - ], - "key": { - "R": { - "tag": "forge:rods/platinum" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "X" + ], + "key": { + "R": { + "tag": "forge:rods/platinum" + }, + "X": { + "tag": "forge:ingots/platinum" + } }, - "X": { - "tag": "forge:ingots/platinum" - } - }, - "result": { - "item": "basemetals:platinum_lever" - }, - "group": "basemetals:platinum_lever" + "result": { + "item": "basemetals:platinum_lever" + }, + "group": "basemetals:platinum_lever" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_nuggets.json b/src/generated/resources/data/basemetals/recipes/platinum_nuggets.json index 9eb07590..6d78e75e 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_nuggets.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:ingots/platinum" - } - ], - "result": { - "item": "basemetals:platinum_nugget", - "count": 9 - }, - "group": "basemetals:platinum_nugget" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/platinum" + } + ], + "result": { + "item": "basemetals:platinum_nugget", + "count": 9 + }, + "group": "basemetals:platinum_nugget" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_pickaxe.json b/src/generated/resources/data/basemetals/recipes/platinum_pickaxe.json index 75e9288b..67b9f94a 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_pickaxe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " S ", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " S ", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/platinum" + } }, - "X": { - "tag": "forge:ingots/platinum" - } - }, - "result": { - "item": "basemetals:platinum_pickaxe" - }, - "group": "basemetals:platinum_pickaxe" + "result": { + "item": "basemetals:platinum_pickaxe" + }, + "group": "basemetals:platinum_pickaxe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_plate.json b/src/generated/resources/data/basemetals/recipes/platinum_plate.json index dcb7a535..77bb9b47 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_plate.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_plate.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/platinum" - } - }, - "result": { - "item": "basemetals:platinum_plate", - "count": 3 - }, - "group": "basemetals:platinum_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/platinum" + } + }, + "result": { + "item": "basemetals:platinum_plate", + "count": 3 + }, + "group": "basemetals:platinum_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/platinum_powder_from_small.json index 5229ee68..4dc2804e 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/platinum" - } - }, - "result": { - "item": "basemetals:platinum_powder" - }, - "group": "basemetals:platinum_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/platinum" + } + }, + "result": { + "item": "basemetals:platinum_powder" + }, + "group": "basemetals:platinum_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/platinum_pressure_plate.json index 6e620a8b..6d11c233 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_pressure_plate.json @@ -1,15 +1,18 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/platinum" - } - }, - "result": { - "item": "basemetals:platinum_pressure_plate" - }, - "group": "basemetals:platinum_pressure_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/platinum" + } + }, + "result": { + "item": "basemetals:platinum_pressure_plate" + }, + "group": "basemetals:platinum_pressure_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_rod.json b/src/generated/resources/data/basemetals/recipes/platinum_rod.json index 3e5b7d21..b709d490 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_rod.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_rod.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:ingots/platinum" - } - }, - "result": { - "item": "basemetals:platinum_rod", - "count": 4 - }, - "group": "basemetals:platinum_rod" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:ingots/platinum" + } + }, + "result": { + "item": "basemetals:platinum_rod", + "count": 4 + }, + "group": "basemetals:platinum_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_scythe.json b/src/generated/resources/data/basemetals/recipes/platinum_scythe.json index b0aa85b1..92725a56 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/platinum" + } }, - "X": { - "tag": "forge:ingots/platinum" - } - }, - "result": { - "item": "basemetals:platinum_scythe" - }, - "group": "basemetals:platinum_scythe" + "result": { + "item": "basemetals:platinum_scythe" + }, + "group": "basemetals:platinum_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_shears.json b/src/generated/resources/data/basemetals/recipes/platinum_shears.json index 9f236496..d54d7db0 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_shears.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_shears.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "X " - ], - "key": { - "X": { - "tag": "forge:ingots/platinum" - } - }, - "result": { - "item": "basemetals:platinum_shears" - }, - "group": "basemetals:platinum_shears" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "X " + ], + "key": { + "X": { + "tag": "forge:ingots/platinum" + } + }, + "result": { + "item": "basemetals:platinum_shears" + }, + "group": "basemetals:platinum_shears" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_shield.json b/src/generated/resources/data/basemetals/recipes/platinum_shield.json index 17ce9b1a..157c4b0c 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_shield.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_shield.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XWX", - "XXX", - " X " - ], - "key": { - "W": { - "tag": "minecraft:planks" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XWX", + "XXX", + " X " + ], + "key": { + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:ingots/platinum" + } }, - "X": { - "tag": "forge:ingots/platinum" - } - }, - "result": { - "item": "basemetals:platinum_shield" - }, - "group": "basemetals:platinum_shield" + "result": { + "item": "basemetals:platinum_shield" + }, + "group": "basemetals:platinum_shield" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_shovel.json b/src/generated/resources/data/basemetals/recipes/platinum_shovel.json index 8e9587fd..ddbcf878 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_shovel.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/platinum" + } }, - "X": { - "tag": "forge:ingots/platinum" - } - }, - "result": { - "item": "basemetals:platinum_shovel" - }, - "group": "basemetals:platinum_shovel" + "result": { + "item": "basemetals:platinum_shovel" + }, + "group": "basemetals:platinum_shovel" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_slab.json b/src/generated/resources/data/basemetals/recipes/platinum_slab.json index b353b86c..a4a199af 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_slab.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_slab.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/platinum" - } - }, - "result": { - "item": "basemetals:platinum_slab", - "count": 6 - }, - "group": "basemetals:platinum_slab" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/platinum" + } + }, + "result": { + "item": "basemetals:platinum_slab", + "count": 6 + }, + "group": "basemetals:platinum_slab" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_smallpowder.json b/src/generated/resources/data/basemetals/recipes/platinum_smallpowder.json index d7a48186..9f844778 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/platinum" - } - ], - "result": { - "item": "basemetals:platinum_smallpowder", - "count": 9 - }, - "group": "basemetals:platinum_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/platinum" + } + ], + "result": { + "item": "basemetals:platinum_smallpowder", + "count": 9 + }, + "group": "basemetals:platinum_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_stairs.json b/src/generated/resources/data/basemetals/recipes/platinum_stairs.json index 3efebbdd..886bdeb8 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_stairs.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X ", - "XX ", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/platinum" - } - }, - "result": { - "item": "basemetals:platinum_stairs", - "count": 4 - }, - "group": "basemetals:platinum_stairs" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/platinum" + } + }, + "result": { + "item": "basemetals:platinum_stairs", + "count": 4 + }, + "group": "basemetals:platinum_stairs" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_sword.json b/src/generated/resources/data/basemetals/recipes/platinum_sword.json index 0c8a4d8c..9dd0c32b 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_sword.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_sword.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/platinum" + } }, - "X": { - "tag": "forge:ingots/platinum" - } - }, - "result": { - "item": "basemetals:platinum_sword" - }, - "group": "basemetals:platinum_sword" + "result": { + "item": "basemetals:platinum_sword" + }, + "group": "basemetals:platinum_sword" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_trapdoor.json b/src/generated/resources/data/basemetals/recipes/platinum_trapdoor.json index 3fab7cf4..3df7e4ed 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_trapdoor.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/platinum" - } - }, - "result": { - "item": "basemetals:platinum_trapdoor" - }, - "group": "basemetals:platinum_trapdoor" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/platinum" + } + }, + "result": { + "item": "basemetals:platinum_trapdoor" + }, + "group": "basemetals:platinum_trapdoor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/platinum_wall.json b/src/generated/resources/data/basemetals/recipes/platinum_wall.json index 006c0936..d59d8e4b 100644 --- a/src/generated/resources/data/basemetals/recipes/platinum_wall.json +++ b/src/generated/resources/data/basemetals/recipes/platinum_wall.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/platinum" - } - }, - "result": { - "item": "basemetals:platinum_wall", - "count": 6 - }, - "group": "basemetals:platinum_wall" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/platinum" + } + }, + "result": { + "item": "basemetals:platinum_wall", + "count": 6 + }, + "group": "basemetals:platinum_wall" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_arrow.json b/src/generated/resources/data/basemetals/recipes/quartz_arrow.json index 9316e4e1..9700fbc5 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_arrow.json @@ -1,24 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "N", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "N", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "N": { + "tag": "forge:nuggets/quartz" + }, + "R": { + "tag": "forge:rods/quartz" + } }, - "N": { - "tag": "forge:nuggets/quartz" + "result": { + "item": "basemetals:quartz_arrow", + "count": 4 }, - "R": { - "tag": "forge:rods/quartz" - } - }, - "result": { - "item": "basemetals:quartz_arrow", - "count": 4 - }, - "group": "basemetals:quartz_arrow" + "group": "basemetals:quartz_arrow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_axe.json b/src/generated/resources/data/basemetals/recipes/quartz_axe.json index 9df94905..cf6192c3 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_axe.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_axe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XS", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XS", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:gems/quartz" + } }, - "X": { - "tag": "forge:gems/quartz" - } - }, - "result": { - "item": "basemetals:quartz_axe" - }, - "group": "basemetals:quartz_axe" + "result": { + "item": "basemetals:quartz_axe" + }, + "group": "basemetals:quartz_axe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_bars.json b/src/generated/resources/data/basemetals/recipes/quartz_bars.json index 04801cf4..8c152c0c 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_bars.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_bars.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:gems/quartz" - } - }, - "result": { - "item": "basemetals:quartz_bars", - "count": 16 - }, - "group": "basemetals:quartz_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:gems/quartz" + } + }, + "result": { + "item": "basemetals:quartz_bars", + "count": 16 + }, + "group": "basemetals:quartz_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_bars_2.json b/src/generated/resources/data/basemetals/recipes/quartz_bars_2.json index 39315949..71b24f62 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_bars_2.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:rods/quartz" - } - }, - "result": { - "item": "basemetals:quartz_bars", - "count": 4 - }, - "group": "basemetals:quartz_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:rods/quartz" + } + }, + "result": { + "item": "basemetals:quartz_bars", + "count": 4 + }, + "group": "basemetals:quartz_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_bolt.json b/src/generated/resources/data/basemetals/recipes/quartz_bolt.json index 1fe0f59c..5c13f0f0 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_bolt.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "R": { + "tag": "forge:rods/quartz" + } }, - "R": { - "tag": "forge:rods/quartz" - } - }, - "result": { - "item": "basemetals:quartz_bolt", - "count": 4 - }, - "group": "basemetals:quartz_bolt" + "result": { + "item": "basemetals:quartz_bolt", + "count": 4 + }, + "group": "basemetals:quartz_bolt" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_boots.json b/src/generated/resources/data/basemetals/recipes/quartz_boots.json index 3331b500..58d0b095 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_boots.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_boots.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:gems/quartz" - } - }, - "result": { - "item": "basemetals:quartz_boots" - }, - "group": "basemetals:quartz_boots" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:gems/quartz" + } + }, + "result": { + "item": "basemetals:quartz_boots" + }, + "group": "basemetals:quartz_boots" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_bow.json b/src/generated/resources/data/basemetals/recipes/quartz_bow.json index 8162e882..bbc4d549 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_bow.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_bow.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " RS", - "R S", - " RS" - ], - "key": { - "R": { - "tag": "forge:rods/quartz" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " RS", + "R S", + " RS" + ], + "key": { + "R": { + "tag": "forge:rods/quartz" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:quartz_bow" - }, - "group": "basemetals:quartz_bow" + "result": { + "item": "basemetals:quartz_bow" + }, + "group": "basemetals:quartz_bow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_button.json b/src/generated/resources/data/basemetals/recipes/quartz_button.json index b7af55f5..748fd9cc 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_button.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_button.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:nuggets/quartz" - } - }, - "result": { - "item": "basemetals:quartz_button" - }, - "group": "basemetals:quartz_button" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:nuggets/quartz" + } + }, + "result": { + "item": "basemetals:quartz_button" + }, + "group": "basemetals:quartz_button" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_chestplate.json b/src/generated/resources/data/basemetals/recipes/quartz_chestplate.json index 573f868c..c7ec73ef 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_chestplate.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:gems/quartz" - } - }, - "result": { - "item": "basemetals:quartz_chestplate" - }, - "group": "basemetals:quartz_chestplate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:gems/quartz" + } + }, + "result": { + "item": "basemetals:quartz_chestplate" + }, + "group": "basemetals:quartz_chestplate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_crackhammer.json b/src/generated/resources/data/basemetals/recipes/quartz_crackhammer.json index 9d03b5c5..3b7a7999 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:storage_blocks/quartz" + } }, - "X": { - "tag": "forge:storage_blocks/quartz" - } - }, - "result": { - "item": "basemetals:quartz_crackhammer" - }, - "group": "basemetals:quartz_crackhammer" + "result": { + "item": "basemetals:quartz_crackhammer" + }, + "group": "basemetals:quartz_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_crossbow.json b/src/generated/resources/data/basemetals/recipes/quartz_crossbow.json index 0f37427a..ee700f6e 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_crossbow.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRR", - " SR", - "R G" - ], - "key": { - "G": { - "tag": "forge:gears/quartz" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRR", + " SR", + "R G" + ], + "key": { + "G": { + "tag": "forge:gears/quartz" + }, + "R": { + "tag": "forge:rods/quartz" + }, + "S": { + "item": "minecraft:string" + } }, - "R": { - "tag": "forge:rods/quartz" + "result": { + "item": "basemetals:quartz_crossbow" }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:quartz_crossbow" - }, - "group": "basemetals:quartz_crossbow" + "group": "basemetals:quartz_crossbow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_door.json b/src/generated/resources/data/basemetals/recipes/quartz_door.json index 42e15b7d..64a2418b 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_door.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_door.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:gems/quartz" - } - }, - "result": { - "item": "basemetals:quartz_door", - "count": 3 - }, - "group": "basemetals:quartz_door" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:gems/quartz" + } + }, + "result": { + "item": "basemetals:quartz_door", + "count": 3 + }, + "group": "basemetals:quartz_door" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_fishingrod.json b/src/generated/resources/data/basemetals/recipes/quartz_fishingrod.json index eec9e636..2c27ab07 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_fishingrod.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " R", - " RS", - "R S" - ], - "key": { - "R": { - "tag": "forge:rods/quartz" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " R", + " RS", + "R S" + ], + "key": { + "R": { + "tag": "forge:rods/quartz" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:quartz_fishing_rod" - }, - "group": "basemetals:quartz_fishing_rod" + "result": { + "item": "basemetals:quartz_fishing_rod" + }, + "group": "basemetals:quartz_fishing_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_gear.json b/src/generated/resources/data/basemetals/recipes/quartz_gear.json index c7d1b97e..dfa9444c 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_gear.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_gear.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "XRX", - " X " - ], - "key": { - "R": { - "tag": "forge:rods/quartz" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XRX", + " X " + ], + "key": { + "R": { + "tag": "forge:rods/quartz" + }, + "X": { + "tag": "forge:gems/quartz" + } }, - "X": { - "tag": "forge:gems/quartz" - } - }, - "result": { - "item": "basemetals:quartz_gear", - "count": 4 - }, - "group": "basemetals:quartz_gear" + "result": { + "item": "basemetals:quartz_gear", + "count": 4 + }, + "group": "basemetals:quartz_gear" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_helmet.json b/src/generated/resources/data/basemetals/recipes/quartz_helmet.json index 64e06cb6..41e46618 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_helmet.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X" - ], - "key": { - "X": { - "tag": "forge:gems/quartz" - } - }, - "result": { - "item": "basemetals:quartz_helmet" - }, - "group": "basemetals:quartz_helmet" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X" + ], + "key": { + "X": { + "tag": "forge:gems/quartz" + } + }, + "result": { + "item": "basemetals:quartz_helmet" + }, + "group": "basemetals:quartz_helmet" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_hoe.json b/src/generated/resources/data/basemetals/recipes/quartz_hoe.json index 364f536d..7a21fdcf 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_hoe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - " S", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " S", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:gems/quartz" + } }, - "X": { - "tag": "forge:gems/quartz" - } - }, - "result": { - "item": "basemetals:quartz_hoe" - }, - "group": "basemetals:quartz_hoe" + "result": { + "item": "basemetals:quartz_hoe" + }, + "group": "basemetals:quartz_hoe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_horsearmor.json b/src/generated/resources/data/basemetals/recipes/quartz_horsearmor.json index 78f99dad..8faa7700 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_horsearmor.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "XWX", - "XXX" - ], - "key": { - "W": { - "tag": "minecraft:wool" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "XWX", + "XXX" + ], + "key": { + "W": { + "tag": "minecraft:wool" + }, + "X": { + "tag": "forge:gems/quartz" + } }, - "X": { - "tag": "forge:gems/quartz" - } - }, - "result": { - "item": "basemetals:quartz_horse_armor" - }, - "group": "basemetals:quartz_horse_armor" + "result": { + "item": "basemetals:quartz_horse_armor" + }, + "group": "basemetals:quartz_horse_armor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_ingot.json b/src/generated/resources/data/basemetals/recipes/quartz_ingot.json index 2ad118a7..e6362d09 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_ingot.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:nuggets/quartz" - } - }, - "result": { - "item": "minecraft:quartz" - }, - "group": "minecraft:quartz" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:nuggets/quartz" + } + }, + "result": { + "item": "minecraft:quartz" + }, + "group": "minecraft:quartz" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_leggings.json b/src/generated/resources/data/basemetals/recipes/quartz_leggings.json index 58376383..756134d2 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_leggings.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:gems/quartz" - } - }, - "result": { - "item": "basemetals:quartz_leggings" - }, - "group": "basemetals:quartz_leggings" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:gems/quartz" + } + }, + "result": { + "item": "basemetals:quartz_leggings" + }, + "group": "basemetals:quartz_leggings" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_lever.json b/src/generated/resources/data/basemetals/recipes/quartz_lever.json index 9df3e11a..f985c527 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_lever.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_lever.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "X" - ], - "key": { - "R": { - "tag": "forge:rods/quartz" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "X" + ], + "key": { + "R": { + "tag": "forge:rods/quartz" + }, + "X": { + "tag": "forge:gems/quartz" + } }, - "X": { - "tag": "forge:gems/quartz" - } - }, - "result": { - "item": "basemetals:quartz_lever" - }, - "group": "basemetals:quartz_lever" + "result": { + "item": "basemetals:quartz_lever" + }, + "group": "basemetals:quartz_lever" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_nugget.json b/src/generated/resources/data/basemetals/recipes/quartz_nugget.json index 842f7919..2e43cc41 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_nugget.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_nugget.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:gems/quartz" - } - ], - "result": { - "item": "basemetals:quartz_nugget", - "count": 9 - }, - "group": "basemetals:quartz_nugget" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:gems/quartz" + } + ], + "result": { + "item": "basemetals:quartz_nugget", + "count": 9 + }, + "group": "basemetals:quartz_nugget" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_pickaxe.json b/src/generated/resources/data/basemetals/recipes/quartz_pickaxe.json index dd29552c..fc4e7cbb 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_pickaxe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " S ", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " S ", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:gems/quartz" + } }, - "X": { - "tag": "forge:gems/quartz" - } - }, - "result": { - "item": "basemetals:quartz_pickaxe" - }, - "group": "basemetals:quartz_pickaxe" + "result": { + "item": "basemetals:quartz_pickaxe" + }, + "group": "basemetals:quartz_pickaxe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/quartz_powder_from_small.json index 8ace6819..6c19838e 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/quartz" - } - }, - "result": { - "item": "basemetals:quartz_powder" - }, - "group": "basemetals:quartz_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/quartz" + } + }, + "result": { + "item": "basemetals:quartz_powder" + }, + "group": "basemetals:quartz_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/quartz_pressure_plate.json index bcc3841a..54527523 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_pressure_plate.json @@ -1,15 +1,18 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX" - ], - "key": { - "X": { - "tag": "forge:gems/quartz" - } - }, - "result": { - "item": "basemetals:quartz_pressure_plate" - }, - "group": "basemetals:quartz_pressure_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX" + ], + "key": { + "X": { + "tag": "forge:gems/quartz" + } + }, + "result": { + "item": "basemetals:quartz_pressure_plate" + }, + "group": "basemetals:quartz_pressure_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_rod.json b/src/generated/resources/data/basemetals/recipes/quartz_rod.json index caa7e93f..0f19e7a7 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_rod.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_rod.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:gems/quartz" - } - }, - "result": { - "item": "basemetals:quartz_rod", - "count": 4 - }, - "group": "basemetals:quartz_rod" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:gems/quartz" + } + }, + "result": { + "item": "basemetals:quartz_rod", + "count": 4 + }, + "group": "basemetals:quartz_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_scythe.json b/src/generated/resources/data/basemetals/recipes/quartz_scythe.json index 5aafe850..1cd4a2cf 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:gems/quartz" + } }, - "X": { - "tag": "forge:gems/quartz" - } - }, - "result": { - "item": "basemetals:quartz_scythe" - }, - "group": "basemetals:quartz_scythe" + "result": { + "item": "basemetals:quartz_scythe" + }, + "group": "basemetals:quartz_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_shears.json b/src/generated/resources/data/basemetals/recipes/quartz_shears.json index 96a987fb..df0e58c5 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_shears.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_shears.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "X " - ], - "key": { - "X": { - "tag": "forge:gems/quartz" - } - }, - "result": { - "item": "basemetals:quartz_shears" - }, - "group": "basemetals:quartz_shears" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "X " + ], + "key": { + "X": { + "tag": "forge:gems/quartz" + } + }, + "result": { + "item": "basemetals:quartz_shears" + }, + "group": "basemetals:quartz_shears" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_shield.json b/src/generated/resources/data/basemetals/recipes/quartz_shield.json index fe4649b0..955123d0 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_shield.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_shield.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XWX", - "XXX", - " X " - ], - "key": { - "W": { - "tag": "minecraft:planks" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XWX", + "XXX", + " X " + ], + "key": { + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:gems/quartz" + } }, - "X": { - "tag": "forge:gems/quartz" - } - }, - "result": { - "item": "basemetals:quartz_shield" - }, - "group": "basemetals:quartz_shield" + "result": { + "item": "basemetals:quartz_shield" + }, + "group": "basemetals:quartz_shield" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_shovel.json b/src/generated/resources/data/basemetals/recipes/quartz_shovel.json index ef2c2861..2f16a892 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_shovel.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:gems/quartz" + } }, - "X": { - "tag": "forge:gems/quartz" - } - }, - "result": { - "item": "basemetals:quartz_shovel" - }, - "group": "basemetals:quartz_shovel" + "result": { + "item": "basemetals:quartz_shovel" + }, + "group": "basemetals:quartz_shovel" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_smallpowder.json b/src/generated/resources/data/basemetals/recipes/quartz_smallpowder.json index 7412b63f..2f15faf2 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/quartz" - } - ], - "result": { - "item": "basemetals:quartz_smallpowder", - "count": 9 - }, - "group": "basemetals:quartz_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/quartz" + } + ], + "result": { + "item": "basemetals:quartz_smallpowder", + "count": 9 + }, + "group": "basemetals:quartz_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_sword.json b/src/generated/resources/data/basemetals/recipes/quartz_sword.json index fdc9eaee..d8c3046c 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_sword.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_sword.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:gems/quartz" + } }, - "X": { - "tag": "forge:gems/quartz" - } - }, - "result": { - "item": "basemetals:quartz_sword" - }, - "group": "basemetals:quartz_sword" + "result": { + "item": "basemetals:quartz_sword" + }, + "group": "basemetals:quartz_sword" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_trapdoor.json b/src/generated/resources/data/basemetals/recipes/quartz_trapdoor.json index b28f5150..bfe7c036 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_trapdoor.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:gems/quartz" - } - }, - "result": { - "item": "basemetals:quartz_trapdoor" - }, - "group": "basemetals:quartz_trapdoor" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:gems/quartz" + } + }, + "result": { + "item": "basemetals:quartz_trapdoor" + }, + "group": "basemetals:quartz_trapdoor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/quartz_wall.json b/src/generated/resources/data/basemetals/recipes/quartz_wall.json index feda3bd6..4e7b8728 100644 --- a/src/generated/resources/data/basemetals/recipes/quartz_wall.json +++ b/src/generated/resources/data/basemetals/recipes/quartz_wall.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/quartz" - } - }, - "result": { - "item": "basemetals:quartz_wall", - "count": 6 - }, - "group": "basemetals:quartz_wall" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/quartz" + } + }, + "result": { + "item": "basemetals:quartz_wall", + "count": 6 + }, + "group": "basemetals:quartz_wall" + } } diff --git a/src/generated/resources/data/basemetals/recipes/rail.json b/src/generated/resources/data/basemetals/recipes/rail.json index 1d9c245d..e117dafc 100644 --- a/src/generated/resources/data/basemetals/recipes/rail.json +++ b/src/generated/resources/data/basemetals/recipes/rail.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XSX", - "X X" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XSX", + "X X" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/steel" + } }, - "X": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "minecraft:rail", - "count": 16 - }, - "group": "minecraft:rail" + "result": { + "item": "minecraft:rail", + "count": 16 + }, + "group": "minecraft:rail" + } } diff --git a/src/generated/resources/data/basemetals/recipes/redstone_from_smallpowder.json b/src/generated/resources/data/basemetals/recipes/redstone_from_smallpowder.json index 5e455bb4..ab89cdd9 100644 --- a/src/generated/resources/data/basemetals/recipes/redstone_from_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/redstone_from_smallpowder.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/redstone" - } - }, - "result": { - "item": "minecraft:redstone" - }, - "group": "minecraft:redstone" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/redstone" + } + }, + "result": { + "item": "minecraft:redstone" + }, + "group": "minecraft:redstone" + } } diff --git a/src/generated/resources/data/basemetals/recipes/redstone_smallpowder.json b/src/generated/resources/data/basemetals/recipes/redstone_smallpowder.json index 2ca54061..905c1e03 100644 --- a/src/generated/resources/data/basemetals/recipes/redstone_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/redstone_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/redstone" - } - ], - "result": { - "item": "basemetals:redstone_smallpowder", - "count": 9 - }, - "group": "basemetals:redstone_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/redstone" + } + ], + "result": { + "item": "basemetals:redstone_smallpowder", + "count": 9 + }, + "group": "basemetals:redstone_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_arrow.json b/src/generated/resources/data/basemetals/recipes/silver_arrow.json index 1db0cdd3..7827bfa9 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/silver_arrow.json @@ -1,24 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "N", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "N", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "N": { + "tag": "forge:nuggets/silver" + }, + "R": { + "tag": "forge:rods/silver" + } }, - "N": { - "tag": "forge:nuggets/silver" + "result": { + "item": "basemetals:silver_arrow", + "count": 4 }, - "R": { - "tag": "forge:rods/silver" - } - }, - "result": { - "item": "basemetals:silver_arrow", - "count": 4 - }, - "group": "basemetals:silver_arrow" + "group": "basemetals:silver_arrow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_axe.json b/src/generated/resources/data/basemetals/recipes/silver_axe.json index 2d45878a..b1f6c89b 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_axe.json +++ b/src/generated/resources/data/basemetals/recipes/silver_axe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XS", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XS", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/silver" + } }, - "X": { - "tag": "forge:ingots/silver" - } - }, - "result": { - "item": "basemetals:silver_axe" - }, - "group": "basemetals:silver_axe" + "result": { + "item": "basemetals:silver_axe" + }, + "group": "basemetals:silver_axe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_bars.json b/src/generated/resources/data/basemetals/recipes/silver_bars.json index c1683b32..52fb03f2 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_bars.json +++ b/src/generated/resources/data/basemetals/recipes/silver_bars.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/silver" - } - }, - "result": { - "item": "basemetals:silver_bars", - "count": 16 - }, - "group": "basemetals:silver_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/silver" + } + }, + "result": { + "item": "basemetals:silver_bars", + "count": 16 + }, + "group": "basemetals:silver_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_bars_2.json b/src/generated/resources/data/basemetals/recipes/silver_bars_2.json index f0aeba96..092745b1 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/silver_bars_2.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:rods/silver" - } - }, - "result": { - "item": "basemetals:silver_bars", - "count": 4 - }, - "group": "basemetals:silver_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:rods/silver" + } + }, + "result": { + "item": "basemetals:silver_bars", + "count": 4 + }, + "group": "basemetals:silver_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_block.json b/src/generated/resources/data/basemetals/recipes/silver_block.json index c8dabdf2..d1b7acfc 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_block.json +++ b/src/generated/resources/data/basemetals/recipes/silver_block.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/silver" - } - }, - "result": { - "item": "basemetals:silver_block" - }, - "group": "basemetals:silver_block" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/silver" + } + }, + "result": { + "item": "basemetals:silver_block" + }, + "group": "basemetals:silver_block" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_block_ingot.json b/src/generated/resources/data/basemetals/recipes/silver_block_ingot.json index 86b02074..e98641b3 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/silver_block_ingot.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/silver" - } - ], - "result": { - "item": "basemetals:silver_ingot", - "count": 9 - }, - "group": "basemetals:silver_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/silver" + } + ], + "result": { + "item": "basemetals:silver_ingot", + "count": 9 + }, + "group": "basemetals:silver_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_bolt.json b/src/generated/resources/data/basemetals/recipes/silver_bolt.json index 0084f5c1..68c40257 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/silver_bolt.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "R": { + "tag": "forge:rods/silver" + } }, - "R": { - "tag": "forge:rods/silver" - } - }, - "result": { - "item": "basemetals:silver_bolt", - "count": 4 - }, - "group": "basemetals:silver_bolt" + "result": { + "item": "basemetals:silver_bolt", + "count": 4 + }, + "group": "basemetals:silver_bolt" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_boots.json b/src/generated/resources/data/basemetals/recipes/silver_boots.json index ee6a5b5f..cd6b79ed 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_boots.json +++ b/src/generated/resources/data/basemetals/recipes/silver_boots.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/silver" - } - }, - "result": { - "item": "basemetals:silver_boots" - }, - "group": "basemetals:silver_boots" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/silver" + } + }, + "result": { + "item": "basemetals:silver_boots" + }, + "group": "basemetals:silver_boots" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_bow.json b/src/generated/resources/data/basemetals/recipes/silver_bow.json index 3524df43..833c2de0 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_bow.json +++ b/src/generated/resources/data/basemetals/recipes/silver_bow.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " RS", - "R S", - " RS" - ], - "key": { - "R": { - "tag": "forge:rods/silver" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " RS", + "R S", + " RS" + ], + "key": { + "R": { + "tag": "forge:rods/silver" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:silver_bow" - }, - "group": "basemetals:silver_bow" + "result": { + "item": "basemetals:silver_bow" + }, + "group": "basemetals:silver_bow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_button.json b/src/generated/resources/data/basemetals/recipes/silver_button.json index 368abeae..4ffec8ee 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_button.json +++ b/src/generated/resources/data/basemetals/recipes/silver_button.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:nuggets/silver" - } - }, - "result": { - "item": "basemetals:silver_button" - }, - "group": "basemetals:silver_button" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:nuggets/silver" + } + }, + "result": { + "item": "basemetals:silver_button" + }, + "group": "basemetals:silver_button" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_chestplate.json b/src/generated/resources/data/basemetals/recipes/silver_chestplate.json index b61efb01..245a82a8 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/silver_chestplate.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/silver" - } - }, - "result": { - "item": "basemetals:silver_chestplate" - }, - "group": "basemetals:silver_chestplate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/silver" + } + }, + "result": { + "item": "basemetals:silver_chestplate" + }, + "group": "basemetals:silver_chestplate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_crackhammer.json b/src/generated/resources/data/basemetals/recipes/silver_crackhammer.json index 4b6bb629..3878ccb3 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/silver_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:storage_blocks/silver" + } }, - "X": { - "tag": "forge:storage_blocks/silver" - } - }, - "result": { - "item": "basemetals:silver_crackhammer" - }, - "group": "basemetals:silver_crackhammer" + "result": { + "item": "basemetals:silver_crackhammer" + }, + "group": "basemetals:silver_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_crossbow.json b/src/generated/resources/data/basemetals/recipes/silver_crossbow.json index 5253b6c7..23531fb0 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/silver_crossbow.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRR", - " SR", - "R G" - ], - "key": { - "G": { - "tag": "forge:gears/silver" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRR", + " SR", + "R G" + ], + "key": { + "G": { + "tag": "forge:gears/silver" + }, + "R": { + "tag": "forge:rods/silver" + }, + "S": { + "item": "minecraft:string" + } }, - "R": { - "tag": "forge:rods/silver" + "result": { + "item": "basemetals:silver_crossbow" }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:silver_crossbow" - }, - "group": "basemetals:silver_crossbow" + "group": "basemetals:silver_crossbow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_door.json b/src/generated/resources/data/basemetals/recipes/silver_door.json index b87a6948..83934566 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_door.json +++ b/src/generated/resources/data/basemetals/recipes/silver_door.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/silver" - } - }, - "result": { - "item": "basemetals:silver_door", - "count": 3 - }, - "group": "basemetals:silver_door" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/silver" + } + }, + "result": { + "item": "basemetals:silver_door", + "count": 3 + }, + "group": "basemetals:silver_door" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_fishingrod.json b/src/generated/resources/data/basemetals/recipes/silver_fishingrod.json index 0b1fa89f..a3cf3291 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/silver_fishingrod.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " R", - " RS", - "R S" - ], - "key": { - "R": { - "tag": "forge:rods/silver" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " R", + " RS", + "R S" + ], + "key": { + "R": { + "tag": "forge:rods/silver" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:silver_fishing_rod" - }, - "group": "basemetals:silver_fishing_rod" + "result": { + "item": "basemetals:silver_fishing_rod" + }, + "group": "basemetals:silver_fishing_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_gear.json b/src/generated/resources/data/basemetals/recipes/silver_gear.json index 802e7559..59518e5d 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_gear.json +++ b/src/generated/resources/data/basemetals/recipes/silver_gear.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "XRX", - " X " - ], - "key": { - "R": { - "tag": "forge:rods/silver" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XRX", + " X " + ], + "key": { + "R": { + "tag": "forge:rods/silver" + }, + "X": { + "tag": "forge:ingots/silver" + } }, - "X": { - "tag": "forge:ingots/silver" - } - }, - "result": { - "item": "basemetals:silver_gear", - "count": 4 - }, - "group": "basemetals:silver_gear" + "result": { + "item": "basemetals:silver_gear", + "count": 4 + }, + "group": "basemetals:silver_gear" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_helmet.json b/src/generated/resources/data/basemetals/recipes/silver_helmet.json index 7d6e49b3..a1680e39 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/silver_helmet.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/silver" - } - }, - "result": { - "item": "basemetals:silver_helmet" - }, - "group": "basemetals:silver_helmet" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/silver" + } + }, + "result": { + "item": "basemetals:silver_helmet" + }, + "group": "basemetals:silver_helmet" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_hoe.json b/src/generated/resources/data/basemetals/recipes/silver_hoe.json index 8dcfb6c8..9b87779a 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/silver_hoe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - " S", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " S", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/silver" + } }, - "X": { - "tag": "forge:ingots/silver" - } - }, - "result": { - "item": "basemetals:silver_hoe" - }, - "group": "basemetals:silver_hoe" + "result": { + "item": "basemetals:silver_hoe" + }, + "group": "basemetals:silver_hoe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_horsearmor.json b/src/generated/resources/data/basemetals/recipes/silver_horsearmor.json index 21980e62..1ec313e8 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/silver_horsearmor.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "XWX", - "XXX" - ], - "key": { - "W": { - "tag": "minecraft:wool" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "XWX", + "XXX" + ], + "key": { + "W": { + "tag": "minecraft:wool" + }, + "X": { + "tag": "forge:ingots/silver" + } }, - "X": { - "tag": "forge:ingots/silver" - } - }, - "result": { - "item": "basemetals:silver_horse_armor" - }, - "group": "basemetals:silver_horse_armor" + "result": { + "item": "basemetals:silver_horse_armor" + }, + "group": "basemetals:silver_horse_armor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/silver_ingot_from_nuggets.json index 34b244c1..e7ea8e87 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/silver_ingot_from_nuggets.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:nuggets/silver" - } - }, - "result": { - "item": "basemetals:silver_ingot" - }, - "group": "basemetals:silver_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:nuggets/silver" + } + }, + "result": { + "item": "basemetals:silver_ingot" + }, + "group": "basemetals:silver_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_leggings.json b/src/generated/resources/data/basemetals/recipes/silver_leggings.json index 0dee08f3..4b6968ae 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/silver_leggings.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/silver" - } - }, - "result": { - "item": "basemetals:silver_leggings" - }, - "group": "basemetals:silver_leggings" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/silver" + } + }, + "result": { + "item": "basemetals:silver_leggings" + }, + "group": "basemetals:silver_leggings" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_lever.json b/src/generated/resources/data/basemetals/recipes/silver_lever.json index 62b33c39..b8d0460b 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_lever.json +++ b/src/generated/resources/data/basemetals/recipes/silver_lever.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "X" - ], - "key": { - "R": { - "tag": "forge:rods/silver" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "X" + ], + "key": { + "R": { + "tag": "forge:rods/silver" + }, + "X": { + "tag": "forge:ingots/silver" + } }, - "X": { - "tag": "forge:ingots/silver" - } - }, - "result": { - "item": "basemetals:silver_lever" - }, - "group": "basemetals:silver_lever" + "result": { + "item": "basemetals:silver_lever" + }, + "group": "basemetals:silver_lever" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_nuggets.json b/src/generated/resources/data/basemetals/recipes/silver_nuggets.json index 1e0286a9..1ef562f7 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/silver_nuggets.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:ingots/silver" - } - ], - "result": { - "item": "basemetals:silver_nugget", - "count": 9 - }, - "group": "basemetals:silver_nugget" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/silver" + } + ], + "result": { + "item": "basemetals:silver_nugget", + "count": 9 + }, + "group": "basemetals:silver_nugget" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_pickaxe.json b/src/generated/resources/data/basemetals/recipes/silver_pickaxe.json index 9ae7c586..49d1f70f 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/silver_pickaxe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " S ", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " S ", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/silver" + } }, - "X": { - "tag": "forge:ingots/silver" - } - }, - "result": { - "item": "basemetals:silver_pickaxe" - }, - "group": "basemetals:silver_pickaxe" + "result": { + "item": "basemetals:silver_pickaxe" + }, + "group": "basemetals:silver_pickaxe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_plate.json b/src/generated/resources/data/basemetals/recipes/silver_plate.json index 9de90471..b8fe5207 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_plate.json +++ b/src/generated/resources/data/basemetals/recipes/silver_plate.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/silver" - } - }, - "result": { - "item": "basemetals:silver_plate", - "count": 3 - }, - "group": "basemetals:silver_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/silver" + } + }, + "result": { + "item": "basemetals:silver_plate", + "count": 3 + }, + "group": "basemetals:silver_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/silver_powder_from_small.json index 52953b20..21a95c87 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/silver_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/silver" - } - }, - "result": { - "item": "basemetals:silver_powder" - }, - "group": "basemetals:silver_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/silver" + } + }, + "result": { + "item": "basemetals:silver_powder" + }, + "group": "basemetals:silver_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/silver_pressure_plate.json index 75e285e4..4a87334c 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/silver_pressure_plate.json @@ -1,15 +1,18 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/silver" - } - }, - "result": { - "item": "basemetals:silver_pressure_plate" - }, - "group": "basemetals:silver_pressure_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/silver" + } + }, + "result": { + "item": "basemetals:silver_pressure_plate" + }, + "group": "basemetals:silver_pressure_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_rod.json b/src/generated/resources/data/basemetals/recipes/silver_rod.json index 8380b19d..f2bf1915 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_rod.json +++ b/src/generated/resources/data/basemetals/recipes/silver_rod.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:ingots/silver" - } - }, - "result": { - "item": "basemetals:silver_rod", - "count": 4 - }, - "group": "basemetals:silver_rod" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:ingots/silver" + } + }, + "result": { + "item": "basemetals:silver_rod", + "count": 4 + }, + "group": "basemetals:silver_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_scythe.json b/src/generated/resources/data/basemetals/recipes/silver_scythe.json index 3844546e..06f655a7 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/silver_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/silver" + } }, - "X": { - "tag": "forge:ingots/silver" - } - }, - "result": { - "item": "basemetals:silver_scythe" - }, - "group": "basemetals:silver_scythe" + "result": { + "item": "basemetals:silver_scythe" + }, + "group": "basemetals:silver_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_shears.json b/src/generated/resources/data/basemetals/recipes/silver_shears.json index a50d96fc..120e9f23 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_shears.json +++ b/src/generated/resources/data/basemetals/recipes/silver_shears.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "X " - ], - "key": { - "X": { - "tag": "forge:ingots/silver" - } - }, - "result": { - "item": "basemetals:silver_shears" - }, - "group": "basemetals:silver_shears" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "X " + ], + "key": { + "X": { + "tag": "forge:ingots/silver" + } + }, + "result": { + "item": "basemetals:silver_shears" + }, + "group": "basemetals:silver_shears" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_shield.json b/src/generated/resources/data/basemetals/recipes/silver_shield.json index 7757a178..e01eaebb 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_shield.json +++ b/src/generated/resources/data/basemetals/recipes/silver_shield.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XWX", - "XXX", - " X " - ], - "key": { - "W": { - "tag": "minecraft:planks" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XWX", + "XXX", + " X " + ], + "key": { + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:ingots/silver" + } }, - "X": { - "tag": "forge:ingots/silver" - } - }, - "result": { - "item": "basemetals:silver_shield" - }, - "group": "basemetals:silver_shield" + "result": { + "item": "basemetals:silver_shield" + }, + "group": "basemetals:silver_shield" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_shovel.json b/src/generated/resources/data/basemetals/recipes/silver_shovel.json index eecbce20..3bd6815a 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/silver_shovel.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/silver" + } }, - "X": { - "tag": "forge:ingots/silver" - } - }, - "result": { - "item": "basemetals:silver_shovel" - }, - "group": "basemetals:silver_shovel" + "result": { + "item": "basemetals:silver_shovel" + }, + "group": "basemetals:silver_shovel" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_slab.json b/src/generated/resources/data/basemetals/recipes/silver_slab.json index cc2e56c0..29ea1510 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_slab.json +++ b/src/generated/resources/data/basemetals/recipes/silver_slab.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/silver" - } - }, - "result": { - "item": "basemetals:silver_slab", - "count": 6 - }, - "group": "basemetals:silver_slab" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/silver" + } + }, + "result": { + "item": "basemetals:silver_slab", + "count": 6 + }, + "group": "basemetals:silver_slab" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_smallpowder.json b/src/generated/resources/data/basemetals/recipes/silver_smallpowder.json index 7ae55d23..0bad5334 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/silver_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/silver" - } - ], - "result": { - "item": "basemetals:silver_smallpowder", - "count": 9 - }, - "group": "basemetals:silver_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/silver" + } + ], + "result": { + "item": "basemetals:silver_smallpowder", + "count": 9 + }, + "group": "basemetals:silver_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_stairs.json b/src/generated/resources/data/basemetals/recipes/silver_stairs.json index 32f90c1f..9303fbd0 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/silver_stairs.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X ", - "XX ", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/silver" - } - }, - "result": { - "item": "basemetals:silver_stairs", - "count": 4 - }, - "group": "basemetals:silver_stairs" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/silver" + } + }, + "result": { + "item": "basemetals:silver_stairs", + "count": 4 + }, + "group": "basemetals:silver_stairs" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_sword.json b/src/generated/resources/data/basemetals/recipes/silver_sword.json index bf5ec7f1..46ae3188 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_sword.json +++ b/src/generated/resources/data/basemetals/recipes/silver_sword.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/silver" + } }, - "X": { - "tag": "forge:ingots/silver" - } - }, - "result": { - "item": "basemetals:silver_sword" - }, - "group": "basemetals:silver_sword" + "result": { + "item": "basemetals:silver_sword" + }, + "group": "basemetals:silver_sword" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_trapdoor.json b/src/generated/resources/data/basemetals/recipes/silver_trapdoor.json index c3c6bf77..fa3f0bd8 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/silver_trapdoor.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/silver" - } - }, - "result": { - "item": "basemetals:silver_trapdoor" - }, - "group": "basemetals:silver_trapdoor" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/silver" + } + }, + "result": { + "item": "basemetals:silver_trapdoor" + }, + "group": "basemetals:silver_trapdoor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/silver_wall.json b/src/generated/resources/data/basemetals/recipes/silver_wall.json index 3947947c..47a0ee3d 100644 --- a/src/generated/resources/data/basemetals/recipes/silver_wall.json +++ b/src/generated/resources/data/basemetals/recipes/silver_wall.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/silver" - } - }, - "result": { - "item": "basemetals:silver_wall", - "count": 6 - }, - "group": "basemetals:silver_wall" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/silver" + } + }, + "result": { + "item": "basemetals:silver_wall", + "count": 6 + }, + "group": "basemetals:silver_wall" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_arrow.json b/src/generated/resources/data/basemetals/recipes/starsteel_arrow.json index 517fe709..8ce45e42 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_arrow.json @@ -1,24 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "N", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "N", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "N": { + "tag": "forge:nuggets/starsteel" + }, + "R": { + "tag": "forge:rods/starsteel" + } }, - "N": { - "tag": "forge:nuggets/starsteel" + "result": { + "item": "basemetals:starsteel_arrow", + "count": 4 }, - "R": { - "tag": "forge:rods/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_arrow", - "count": 4 - }, - "group": "basemetals:starsteel_arrow" + "group": "basemetals:starsteel_arrow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_axe.json b/src/generated/resources/data/basemetals/recipes/starsteel_axe.json index 0a1daaaa..39bcceed 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_axe.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_axe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XS", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XS", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/starsteel" + } }, - "X": { - "tag": "forge:ingots/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_axe" - }, - "group": "basemetals:starsteel_axe" + "result": { + "item": "basemetals:starsteel_axe" + }, + "group": "basemetals:starsteel_axe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_bars.json b/src/generated/resources/data/basemetals/recipes/starsteel_bars.json index ff164b83..0436193d 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_bars.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_bars.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_bars", - "count": 16 - }, - "group": "basemetals:starsteel_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/starsteel" + } + }, + "result": { + "item": "basemetals:starsteel_bars", + "count": 16 + }, + "group": "basemetals:starsteel_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_bars_2.json b/src/generated/resources/data/basemetals/recipes/starsteel_bars_2.json index f7d5c5d5..6b03e339 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_bars_2.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:rods/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_bars", - "count": 4 - }, - "group": "basemetals:starsteel_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:rods/starsteel" + } + }, + "result": { + "item": "basemetals:starsteel_bars", + "count": 4 + }, + "group": "basemetals:starsteel_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_block.json b/src/generated/resources/data/basemetals/recipes/starsteel_block.json index becc3fb7..95eecd8e 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_block.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_block.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_block" - }, - "group": "basemetals:starsteel_block" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/starsteel" + } + }, + "result": { + "item": "basemetals:starsteel_block" + }, + "group": "basemetals:starsteel_block" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_block_ingot.json b/src/generated/resources/data/basemetals/recipes/starsteel_block_ingot.json index 5ddd2990..c9fafd5c 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_block_ingot.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/starsteel" - } - ], - "result": { - "item": "basemetals:starsteel_ingot", - "count": 9 - }, - "group": "basemetals:starsteel_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/starsteel" + } + ], + "result": { + "item": "basemetals:starsteel_ingot", + "count": 9 + }, + "group": "basemetals:starsteel_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_bolt.json b/src/generated/resources/data/basemetals/recipes/starsteel_bolt.json index 6d575bdc..30606d43 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_bolt.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "R": { + "tag": "forge:rods/starsteel" + } }, - "R": { - "tag": "forge:rods/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_bolt", - "count": 4 - }, - "group": "basemetals:starsteel_bolt" + "result": { + "item": "basemetals:starsteel_bolt", + "count": 4 + }, + "group": "basemetals:starsteel_bolt" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_boots.json b/src/generated/resources/data/basemetals/recipes/starsteel_boots.json index c636ce35..0ab90259 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_boots.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_boots.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_boots" - }, - "group": "basemetals:starsteel_boots" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/starsteel" + } + }, + "result": { + "item": "basemetals:starsteel_boots" + }, + "group": "basemetals:starsteel_boots" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_bow.json b/src/generated/resources/data/basemetals/recipes/starsteel_bow.json index f9b9e7c0..6e1c0007 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_bow.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_bow.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " RS", - "R S", - " RS" - ], - "key": { - "R": { - "tag": "forge:rods/starsteel" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " RS", + "R S", + " RS" + ], + "key": { + "R": { + "tag": "forge:rods/starsteel" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:starsteel_bow" - }, - "group": "basemetals:starsteel_bow" + "result": { + "item": "basemetals:starsteel_bow" + }, + "group": "basemetals:starsteel_bow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_button.json b/src/generated/resources/data/basemetals/recipes/starsteel_button.json index 67e88187..a611448c 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_button.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_button.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:nuggets/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_button" - }, - "group": "basemetals:starsteel_button" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:nuggets/starsteel" + } + }, + "result": { + "item": "basemetals:starsteel_button" + }, + "group": "basemetals:starsteel_button" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_chestplate.json b/src/generated/resources/data/basemetals/recipes/starsteel_chestplate.json index c23b2924..7f4dc24d 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_chestplate.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_chestplate" - }, - "group": "basemetals:starsteel_chestplate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/starsteel" + } + }, + "result": { + "item": "basemetals:starsteel_chestplate" + }, + "group": "basemetals:starsteel_chestplate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_crackhammer.json b/src/generated/resources/data/basemetals/recipes/starsteel_crackhammer.json index 7f8960d1..4b0d11d3 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:storage_blocks/starsteel" + } }, - "X": { - "tag": "forge:storage_blocks/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_crackhammer" - }, - "group": "basemetals:starsteel_crackhammer" + "result": { + "item": "basemetals:starsteel_crackhammer" + }, + "group": "basemetals:starsteel_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_crossbow.json b/src/generated/resources/data/basemetals/recipes/starsteel_crossbow.json index 466cb375..f8e1b894 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_crossbow.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRR", - " SR", - "R G" - ], - "key": { - "G": { - "tag": "forge:gears/starsteel" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRR", + " SR", + "R G" + ], + "key": { + "G": { + "tag": "forge:gears/starsteel" + }, + "R": { + "tag": "forge:rods/starsteel" + }, + "S": { + "item": "minecraft:string" + } }, - "R": { - "tag": "forge:rods/starsteel" + "result": { + "item": "basemetals:starsteel_crossbow" }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:starsteel_crossbow" - }, - "group": "basemetals:starsteel_crossbow" + "group": "basemetals:starsteel_crossbow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_door.json b/src/generated/resources/data/basemetals/recipes/starsteel_door.json index c049a165..c2bdd9b5 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_door.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_door.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_door", - "count": 3 - }, - "group": "basemetals:starsteel_door" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/starsteel" + } + }, + "result": { + "item": "basemetals:starsteel_door", + "count": 3 + }, + "group": "basemetals:starsteel_door" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_fishingrod.json b/src/generated/resources/data/basemetals/recipes/starsteel_fishingrod.json index b21e5eae..dc0f79a1 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_fishingrod.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " R", - " RS", - "R S" - ], - "key": { - "R": { - "tag": "forge:rods/starsteel" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " R", + " RS", + "R S" + ], + "key": { + "R": { + "tag": "forge:rods/starsteel" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:starsteel_fishing_rod" - }, - "group": "basemetals:starsteel_fishing_rod" + "result": { + "item": "basemetals:starsteel_fishing_rod" + }, + "group": "basemetals:starsteel_fishing_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_gear.json b/src/generated/resources/data/basemetals/recipes/starsteel_gear.json index 602550ce..610a2845 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_gear.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_gear.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "XRX", - " X " - ], - "key": { - "R": { - "tag": "forge:rods/starsteel" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XRX", + " X " + ], + "key": { + "R": { + "tag": "forge:rods/starsteel" + }, + "X": { + "tag": "forge:ingots/starsteel" + } }, - "X": { - "tag": "forge:ingots/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_gear", - "count": 4 - }, - "group": "basemetals:starsteel_gear" + "result": { + "item": "basemetals:starsteel_gear", + "count": 4 + }, + "group": "basemetals:starsteel_gear" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_helmet.json b/src/generated/resources/data/basemetals/recipes/starsteel_helmet.json index 0322ab5e..2f14cc6e 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_helmet.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_helmet" - }, - "group": "basemetals:starsteel_helmet" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/starsteel" + } + }, + "result": { + "item": "basemetals:starsteel_helmet" + }, + "group": "basemetals:starsteel_helmet" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_hoe.json b/src/generated/resources/data/basemetals/recipes/starsteel_hoe.json index 62137f9e..8e7ee8e6 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_hoe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - " S", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " S", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/starsteel" + } }, - "X": { - "tag": "forge:ingots/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_hoe" - }, - "group": "basemetals:starsteel_hoe" + "result": { + "item": "basemetals:starsteel_hoe" + }, + "group": "basemetals:starsteel_hoe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_horsearmor.json b/src/generated/resources/data/basemetals/recipes/starsteel_horsearmor.json index 31ca8ffd..0e402914 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_horsearmor.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "XWX", - "XXX" - ], - "key": { - "W": { - "tag": "minecraft:wool" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "XWX", + "XXX" + ], + "key": { + "W": { + "tag": "minecraft:wool" + }, + "X": { + "tag": "forge:ingots/starsteel" + } }, - "X": { - "tag": "forge:ingots/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_horse_armor" - }, - "group": "basemetals:starsteel_horse_armor" + "result": { + "item": "basemetals:starsteel_horse_armor" + }, + "group": "basemetals:starsteel_horse_armor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/starsteel_ingot_from_nuggets.json index 4a5e2019..bb0bb00c 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_ingot_from_nuggets.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:nuggets/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_ingot" - }, - "group": "basemetals:starsteel_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:nuggets/starsteel" + } + }, + "result": { + "item": "basemetals:starsteel_ingot" + }, + "group": "basemetals:starsteel_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_leggings.json b/src/generated/resources/data/basemetals/recipes/starsteel_leggings.json index eb387de1..e7b0c866 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_leggings.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_leggings" - }, - "group": "basemetals:starsteel_leggings" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/starsteel" + } + }, + "result": { + "item": "basemetals:starsteel_leggings" + }, + "group": "basemetals:starsteel_leggings" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_lever.json b/src/generated/resources/data/basemetals/recipes/starsteel_lever.json index 0487eeba..54130cdb 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_lever.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_lever.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "X" - ], - "key": { - "R": { - "tag": "forge:rods/starsteel" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "X" + ], + "key": { + "R": { + "tag": "forge:rods/starsteel" + }, + "X": { + "tag": "forge:ingots/starsteel" + } }, - "X": { - "tag": "forge:ingots/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_lever" - }, - "group": "basemetals:starsteel_lever" + "result": { + "item": "basemetals:starsteel_lever" + }, + "group": "basemetals:starsteel_lever" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_nuggets.json b/src/generated/resources/data/basemetals/recipes/starsteel_nuggets.json index 9e8c7fe0..30da216f 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_nuggets.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:ingots/starsteel" - } - ], - "result": { - "item": "basemetals:starsteel_nugget", - "count": 9 - }, - "group": "basemetals:starsteel_nugget" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/starsteel" + } + ], + "result": { + "item": "basemetals:starsteel_nugget", + "count": 9 + }, + "group": "basemetals:starsteel_nugget" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_pickaxe.json b/src/generated/resources/data/basemetals/recipes/starsteel_pickaxe.json index 946e0f24..5eea2f71 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_pickaxe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " S ", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " S ", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/starsteel" + } }, - "X": { - "tag": "forge:ingots/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_pickaxe" - }, - "group": "basemetals:starsteel_pickaxe" + "result": { + "item": "basemetals:starsteel_pickaxe" + }, + "group": "basemetals:starsteel_pickaxe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_plate.json b/src/generated/resources/data/basemetals/recipes/starsteel_plate.json index f851c99a..a9d89948 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_plate.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_plate.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_plate", - "count": 3 - }, - "group": "basemetals:starsteel_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/starsteel" + } + }, + "result": { + "item": "basemetals:starsteel_plate", + "count": 3 + }, + "group": "basemetals:starsteel_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/starsteel_powder_from_small.json index 4577a364..ed7bb731 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_powder" - }, - "group": "basemetals:starsteel_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/starsteel" + } + }, + "result": { + "item": "basemetals:starsteel_powder" + }, + "group": "basemetals:starsteel_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/starsteel_pressure_plate.json index 1666531e..0228a04b 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_pressure_plate.json @@ -1,15 +1,18 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_pressure_plate" - }, - "group": "basemetals:starsteel_pressure_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/starsteel" + } + }, + "result": { + "item": "basemetals:starsteel_pressure_plate" + }, + "group": "basemetals:starsteel_pressure_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_rod.json b/src/generated/resources/data/basemetals/recipes/starsteel_rod.json index 0959fd0a..eb084ca3 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_rod.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_rod.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:ingots/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_rod", - "count": 4 - }, - "group": "basemetals:starsteel_rod" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:ingots/starsteel" + } + }, + "result": { + "item": "basemetals:starsteel_rod", + "count": 4 + }, + "group": "basemetals:starsteel_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_scythe.json b/src/generated/resources/data/basemetals/recipes/starsteel_scythe.json index 6c8ed094..9c83b289 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/starsteel" + } }, - "X": { - "tag": "forge:ingots/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_scythe" - }, - "group": "basemetals:starsteel_scythe" + "result": { + "item": "basemetals:starsteel_scythe" + }, + "group": "basemetals:starsteel_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_shears.json b/src/generated/resources/data/basemetals/recipes/starsteel_shears.json index 9760d45b..d8ed5f6f 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_shears.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_shears.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "X " - ], - "key": { - "X": { - "tag": "forge:ingots/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_shears" - }, - "group": "basemetals:starsteel_shears" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "X " + ], + "key": { + "X": { + "tag": "forge:ingots/starsteel" + } + }, + "result": { + "item": "basemetals:starsteel_shears" + }, + "group": "basemetals:starsteel_shears" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_shield.json b/src/generated/resources/data/basemetals/recipes/starsteel_shield.json index 77736b41..539c7dda 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_shield.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_shield.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XWX", - "XXX", - " X " - ], - "key": { - "W": { - "tag": "minecraft:planks" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XWX", + "XXX", + " X " + ], + "key": { + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:ingots/starsteel" + } }, - "X": { - "tag": "forge:ingots/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_shield" - }, - "group": "basemetals:starsteel_shield" + "result": { + "item": "basemetals:starsteel_shield" + }, + "group": "basemetals:starsteel_shield" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_shovel.json b/src/generated/resources/data/basemetals/recipes/starsteel_shovel.json index 4ef045da..e6498c46 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_shovel.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/starsteel" + } }, - "X": { - "tag": "forge:ingots/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_shovel" - }, - "group": "basemetals:starsteel_shovel" + "result": { + "item": "basemetals:starsteel_shovel" + }, + "group": "basemetals:starsteel_shovel" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_slab.json b/src/generated/resources/data/basemetals/recipes/starsteel_slab.json index d0f4fb3b..8bc588f1 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_slab.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_slab.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_slab", - "count": 6 - }, - "group": "basemetals:starsteel_slab" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/starsteel" + } + }, + "result": { + "item": "basemetals:starsteel_slab", + "count": 6 + }, + "group": "basemetals:starsteel_slab" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_smallpowder.json b/src/generated/resources/data/basemetals/recipes/starsteel_smallpowder.json index ec7050b6..846586d9 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/starsteel" - } - ], - "result": { - "item": "basemetals:starsteel_smallpowder", - "count": 9 - }, - "group": "basemetals:starsteel_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/starsteel" + } + ], + "result": { + "item": "basemetals:starsteel_smallpowder", + "count": 9 + }, + "group": "basemetals:starsteel_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_stairs.json b/src/generated/resources/data/basemetals/recipes/starsteel_stairs.json index a59b9802..867df13c 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_stairs.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X ", - "XX ", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_stairs", - "count": 4 - }, - "group": "basemetals:starsteel_stairs" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/starsteel" + } + }, + "result": { + "item": "basemetals:starsteel_stairs", + "count": 4 + }, + "group": "basemetals:starsteel_stairs" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_sword.json b/src/generated/resources/data/basemetals/recipes/starsteel_sword.json index 089708e3..d2b3e47b 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_sword.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_sword.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/starsteel" + } }, - "X": { - "tag": "forge:ingots/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_sword" - }, - "group": "basemetals:starsteel_sword" + "result": { + "item": "basemetals:starsteel_sword" + }, + "group": "basemetals:starsteel_sword" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_trapdoor.json b/src/generated/resources/data/basemetals/recipes/starsteel_trapdoor.json index 0903415b..40bf9148 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_trapdoor.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_trapdoor" - }, - "group": "basemetals:starsteel_trapdoor" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/starsteel" + } + }, + "result": { + "item": "basemetals:starsteel_trapdoor" + }, + "group": "basemetals:starsteel_trapdoor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/starsteel_wall.json b/src/generated/resources/data/basemetals/recipes/starsteel_wall.json index 77b0027a..697cab01 100644 --- a/src/generated/resources/data/basemetals/recipes/starsteel_wall.json +++ b/src/generated/resources/data/basemetals/recipes/starsteel_wall.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/starsteel" - } - }, - "result": { - "item": "basemetals:starsteel_wall", - "count": 6 - }, - "group": "basemetals:starsteel_wall" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/starsteel" + } + }, + "result": { + "item": "basemetals:starsteel_wall", + "count": 6 + }, + "group": "basemetals:starsteel_wall" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_anvil.json b/src/generated/resources/data/basemetals/recipes/steel_anvil.json index a67fde96..af5c6cf9 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_anvil.json +++ b/src/generated/resources/data/basemetals/recipes/steel_anvil.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "BBB", - " B ", - "III" - ], - "key": { - "B": { - "tag": "forge:storage_blocks/steel" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "BBB", + " B ", + "III" + ], + "key": { + "B": { + "tag": "forge:storage_blocks/steel" + }, + "I": { + "tag": "forge:ingots/steel" + } }, - "I": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "basemetals:steel_anvil" - }, - "group": "basemetals:steel_anvil" + "result": { + "item": "basemetals:steel_anvil" + }, + "group": "basemetals:steel_anvil" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_arrow.json b/src/generated/resources/data/basemetals/recipes/steel_arrow.json index 4d54b581..a6ff7d6a 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/steel_arrow.json @@ -1,24 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "N", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "N", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "N": { + "tag": "forge:nuggets/steel" + }, + "R": { + "tag": "forge:rods/steel" + } }, - "N": { - "tag": "forge:nuggets/steel" + "result": { + "item": "basemetals:steel_arrow", + "count": 4 }, - "R": { - "tag": "forge:rods/steel" - } - }, - "result": { - "item": "basemetals:steel_arrow", - "count": 4 - }, - "group": "basemetals:steel_arrow" + "group": "basemetals:steel_arrow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_axe.json b/src/generated/resources/data/basemetals/recipes/steel_axe.json index 799f801d..ef20c653 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_axe.json +++ b/src/generated/resources/data/basemetals/recipes/steel_axe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XS", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XS", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/steel" + } }, - "X": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "basemetals:steel_axe" - }, - "group": "basemetals:steel_axe" + "result": { + "item": "basemetals:steel_axe" + }, + "group": "basemetals:steel_axe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_bars.json b/src/generated/resources/data/basemetals/recipes/steel_bars.json index 416f93db..4dc19286 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_bars.json +++ b/src/generated/resources/data/basemetals/recipes/steel_bars.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "basemetals:steel_bars", - "count": 16 - }, - "group": "basemetals:steel_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/steel" + } + }, + "result": { + "item": "basemetals:steel_bars", + "count": 16 + }, + "group": "basemetals:steel_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_bars_2.json b/src/generated/resources/data/basemetals/recipes/steel_bars_2.json index 343cc816..1fc18881 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/steel_bars_2.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:rods/steel" - } - }, - "result": { - "item": "basemetals:steel_bars", - "count": 4 - }, - "group": "basemetals:steel_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:rods/steel" + } + }, + "result": { + "item": "basemetals:steel_bars", + "count": 4 + }, + "group": "basemetals:steel_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_blend.json b/src/generated/resources/data/basemetals/recipes/steel_blend.json index 2ebe9723..3a1a47ee 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_blend.json +++ b/src/generated/resources/data/basemetals/recipes/steel_blend.json @@ -1,37 +1,40 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/iron" - }, - { - "tag": "forge:dusts/iron" - }, - { - "tag": "forge:dusts/iron" - }, - { - "tag": "forge:dusts/iron" - }, - { - "tag": "forge:dusts/iron" - }, - { - "tag": "forge:dusts/iron" - }, - { - "tag": "forge:dusts/iron" - }, - { - "tag": "forge:dusts/iron" - }, - { - "tag": "forge:dusts/coal" - } - ], - "result": { - "item": "basemetals:steel_blend", - "count": 8 - }, - "group": "basemetals:steel_blend" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/iron" + }, + { + "tag": "forge:dusts/iron" + }, + { + "tag": "forge:dusts/iron" + }, + { + "tag": "forge:dusts/iron" + }, + { + "tag": "forge:dusts/iron" + }, + { + "tag": "forge:dusts/iron" + }, + { + "tag": "forge:dusts/iron" + }, + { + "tag": "forge:dusts/iron" + }, + { + "tag": "forge:dusts/coal" + } + ], + "result": { + "item": "basemetals:steel_blend", + "count": 8 + }, + "group": "basemetals:steel_blend" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_blend_from_small.json b/src/generated/resources/data/basemetals/recipes/steel_blend_from_small.json index 01745885..58c5919f 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_blend_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/steel_blend_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:small_blends/steel" - } - }, - "result": { - "item": "basemetals:steel_blend" - }, - "group": "basemetals:steel_blend" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:small_blends/steel" + } + }, + "result": { + "item": "basemetals:steel_blend" + }, + "group": "basemetals:steel_blend" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_block.json b/src/generated/resources/data/basemetals/recipes/steel_block.json index d37e4c48..1bd432e0 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_block.json +++ b/src/generated/resources/data/basemetals/recipes/steel_block.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "basemetals:steel_block" - }, - "group": "basemetals:steel_block" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/steel" + } + }, + "result": { + "item": "basemetals:steel_block" + }, + "group": "basemetals:steel_block" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_block_ingot.json b/src/generated/resources/data/basemetals/recipes/steel_block_ingot.json index 34689920..9f9681d4 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/steel_block_ingot.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/steel" - } - ], - "result": { - "item": "basemetals:steel_ingot", - "count": 9 - }, - "group": "basemetals:steel_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/steel" + } + ], + "result": { + "item": "basemetals:steel_ingot", + "count": 9 + }, + "group": "basemetals:steel_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_bolt.json b/src/generated/resources/data/basemetals/recipes/steel_bolt.json index cc075948..7c110dbc 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/steel_bolt.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "R": { + "tag": "forge:rods/steel" + } }, - "R": { - "tag": "forge:rods/steel" - } - }, - "result": { - "item": "basemetals:steel_bolt", - "count": 4 - }, - "group": "basemetals:steel_bolt" + "result": { + "item": "basemetals:steel_bolt", + "count": 4 + }, + "group": "basemetals:steel_bolt" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_boots.json b/src/generated/resources/data/basemetals/recipes/steel_boots.json index 054088ae..a4d1db81 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_boots.json +++ b/src/generated/resources/data/basemetals/recipes/steel_boots.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "basemetals:steel_boots" - }, - "group": "basemetals:steel_boots" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/steel" + } + }, + "result": { + "item": "basemetals:steel_boots" + }, + "group": "basemetals:steel_boots" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_bow.json b/src/generated/resources/data/basemetals/recipes/steel_bow.json index 3af47530..6af1ca81 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_bow.json +++ b/src/generated/resources/data/basemetals/recipes/steel_bow.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " RS", - "R S", - " RS" - ], - "key": { - "R": { - "tag": "forge:rods/steel" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " RS", + "R S", + " RS" + ], + "key": { + "R": { + "tag": "forge:rods/steel" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:steel_bow" - }, - "group": "basemetals:steel_bow" + "result": { + "item": "basemetals:steel_bow" + }, + "group": "basemetals:steel_bow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_button.json b/src/generated/resources/data/basemetals/recipes/steel_button.json index 0a69a939..87cd507a 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_button.json +++ b/src/generated/resources/data/basemetals/recipes/steel_button.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:nuggets/steel" - } - }, - "result": { - "item": "basemetals:steel_button" - }, - "group": "basemetals:steel_button" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:nuggets/steel" + } + }, + "result": { + "item": "basemetals:steel_button" + }, + "group": "basemetals:steel_button" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_chestplate.json b/src/generated/resources/data/basemetals/recipes/steel_chestplate.json index 00975669..2fe576f8 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/steel_chestplate.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "basemetals:steel_chestplate" - }, - "group": "basemetals:steel_chestplate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/steel" + } + }, + "result": { + "item": "basemetals:steel_chestplate" + }, + "group": "basemetals:steel_chestplate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_crackhammer.json b/src/generated/resources/data/basemetals/recipes/steel_crackhammer.json index bd07b0da..ee989dc1 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/steel_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:storage_blocks/steel" + } }, - "X": { - "tag": "forge:storage_blocks/steel" - } - }, - "result": { - "item": "basemetals:steel_crackhammer" - }, - "group": "basemetals:steel_crackhammer" + "result": { + "item": "basemetals:steel_crackhammer" + }, + "group": "basemetals:steel_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_crossbow.json b/src/generated/resources/data/basemetals/recipes/steel_crossbow.json index 58d5d30a..be44ef4f 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/steel_crossbow.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRR", - " SR", - "R G" - ], - "key": { - "G": { - "tag": "forge:gears/steel" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRR", + " SR", + "R G" + ], + "key": { + "G": { + "tag": "forge:gears/steel" + }, + "R": { + "tag": "forge:rods/steel" + }, + "S": { + "item": "minecraft:string" + } }, - "R": { - "tag": "forge:rods/steel" + "result": { + "item": "basemetals:steel_crossbow" }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:steel_crossbow" - }, - "group": "basemetals:steel_crossbow" + "group": "basemetals:steel_crossbow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_door.json b/src/generated/resources/data/basemetals/recipes/steel_door.json index 7b7e36e0..46ec3ff6 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_door.json +++ b/src/generated/resources/data/basemetals/recipes/steel_door.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "basemetals:steel_door", - "count": 3 - }, - "group": "basemetals:steel_door" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/steel" + } + }, + "result": { + "item": "basemetals:steel_door", + "count": 3 + }, + "group": "basemetals:steel_door" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_fishingrod.json b/src/generated/resources/data/basemetals/recipes/steel_fishingrod.json index 04b69f4e..77981c51 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/steel_fishingrod.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " R", - " RS", - "R S" - ], - "key": { - "R": { - "tag": "forge:rods/steel" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " R", + " RS", + "R S" + ], + "key": { + "R": { + "tag": "forge:rods/steel" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:steel_fishing_rod" - }, - "group": "basemetals:steel_fishing_rod" + "result": { + "item": "basemetals:steel_fishing_rod" + }, + "group": "basemetals:steel_fishing_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_gear.json b/src/generated/resources/data/basemetals/recipes/steel_gear.json index d3280b64..9c315a2d 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_gear.json +++ b/src/generated/resources/data/basemetals/recipes/steel_gear.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "XRX", - " X " - ], - "key": { - "R": { - "tag": "forge:rods/steel" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XRX", + " X " + ], + "key": { + "R": { + "tag": "forge:rods/steel" + }, + "X": { + "tag": "forge:ingots/steel" + } }, - "X": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "basemetals:steel_gear", - "count": 4 - }, - "group": "basemetals:steel_gear" + "result": { + "item": "basemetals:steel_gear", + "count": 4 + }, + "group": "basemetals:steel_gear" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_helmet.json b/src/generated/resources/data/basemetals/recipes/steel_helmet.json index fdd38028..081404a0 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/steel_helmet.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "basemetals:steel_helmet" - }, - "group": "basemetals:steel_helmet" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/steel" + } + }, + "result": { + "item": "basemetals:steel_helmet" + }, + "group": "basemetals:steel_helmet" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_hoe.json b/src/generated/resources/data/basemetals/recipes/steel_hoe.json index 197634d3..13a6fed7 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/steel_hoe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - " S", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " S", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/steel" + } }, - "X": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "basemetals:steel_hoe" - }, - "group": "basemetals:steel_hoe" + "result": { + "item": "basemetals:steel_hoe" + }, + "group": "basemetals:steel_hoe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_horsearmor.json b/src/generated/resources/data/basemetals/recipes/steel_horsearmor.json index 4d6dd4a9..ca7648c0 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/steel_horsearmor.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "XWX", - "XXX" - ], - "key": { - "W": { - "tag": "minecraft:wool" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "XWX", + "XXX" + ], + "key": { + "W": { + "tag": "minecraft:wool" + }, + "X": { + "tag": "forge:ingots/steel" + } }, - "X": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "basemetals:steel_horse_armor" - }, - "group": "basemetals:steel_horse_armor" + "result": { + "item": "basemetals:steel_horse_armor" + }, + "group": "basemetals:steel_horse_armor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/steel_ingot_from_nuggets.json index 4d5fe0d9..d2f80c56 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/steel_ingot_from_nuggets.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:nuggets/steel" - } - }, - "result": { - "item": "basemetals:steel_ingot" - }, - "group": "basemetals:steel_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:nuggets/steel" + } + }, + "result": { + "item": "basemetals:steel_ingot" + }, + "group": "basemetals:steel_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_leggings.json b/src/generated/resources/data/basemetals/recipes/steel_leggings.json index 8534a14a..ee720279 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/steel_leggings.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "basemetals:steel_leggings" - }, - "group": "basemetals:steel_leggings" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/steel" + } + }, + "result": { + "item": "basemetals:steel_leggings" + }, + "group": "basemetals:steel_leggings" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_lever.json b/src/generated/resources/data/basemetals/recipes/steel_lever.json index ded5b800..4234962b 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_lever.json +++ b/src/generated/resources/data/basemetals/recipes/steel_lever.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "X" - ], - "key": { - "R": { - "tag": "forge:rods/steel" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "X" + ], + "key": { + "R": { + "tag": "forge:rods/steel" + }, + "X": { + "tag": "forge:ingots/steel" + } }, - "X": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "basemetals:steel_lever" - }, - "group": "basemetals:steel_lever" + "result": { + "item": "basemetals:steel_lever" + }, + "group": "basemetals:steel_lever" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_nuggets.json b/src/generated/resources/data/basemetals/recipes/steel_nuggets.json index 290ddb24..232e58ee 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/steel_nuggets.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:ingots/steel" - } - ], - "result": { - "item": "basemetals:steel_nugget", - "count": 9 - }, - "group": "basemetals:steel_nugget" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/steel" + } + ], + "result": { + "item": "basemetals:steel_nugget", + "count": 9 + }, + "group": "basemetals:steel_nugget" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_pickaxe.json b/src/generated/resources/data/basemetals/recipes/steel_pickaxe.json index a84d67e7..f0d88ad2 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/steel_pickaxe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " S ", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " S ", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/steel" + } }, - "X": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "basemetals:steel_pickaxe" - }, - "group": "basemetals:steel_pickaxe" + "result": { + "item": "basemetals:steel_pickaxe" + }, + "group": "basemetals:steel_pickaxe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_plate.json b/src/generated/resources/data/basemetals/recipes/steel_plate.json index 33fc6e72..7fa059f7 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_plate.json +++ b/src/generated/resources/data/basemetals/recipes/steel_plate.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "basemetals:steel_plate", - "count": 3 - }, - "group": "basemetals:steel_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/steel" + } + }, + "result": { + "item": "basemetals:steel_plate", + "count": 3 + }, + "group": "basemetals:steel_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/steel_powder_from_small.json index f6bb3f4b..71cb02eb 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/steel_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/steel" - } - }, - "result": { - "item": "basemetals:steel_powder" - }, - "group": "basemetals:steel_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/steel" + } + }, + "result": { + "item": "basemetals:steel_powder" + }, + "group": "basemetals:steel_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/steel_pressure_plate.json index ade5ec94..a5adac30 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/steel_pressure_plate.json @@ -1,15 +1,18 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "basemetals:steel_pressure_plate" - }, - "group": "basemetals:steel_pressure_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/steel" + } + }, + "result": { + "item": "basemetals:steel_pressure_plate" + }, + "group": "basemetals:steel_pressure_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_rod.json b/src/generated/resources/data/basemetals/recipes/steel_rod.json index ee5ed4fc..3a7ef97c 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_rod.json +++ b/src/generated/resources/data/basemetals/recipes/steel_rod.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "basemetals:steel_rod", - "count": 4 - }, - "group": "basemetals:steel_rod" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:ingots/steel" + } + }, + "result": { + "item": "basemetals:steel_rod", + "count": 4 + }, + "group": "basemetals:steel_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_scythe.json b/src/generated/resources/data/basemetals/recipes/steel_scythe.json index 0f2c7884..b2fc5d66 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/steel_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/steel" + } }, - "X": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "basemetals:steel_scythe" - }, - "group": "basemetals:steel_scythe" + "result": { + "item": "basemetals:steel_scythe" + }, + "group": "basemetals:steel_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_shears.json b/src/generated/resources/data/basemetals/recipes/steel_shears.json index 94757ee1..a3cb2129 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_shears.json +++ b/src/generated/resources/data/basemetals/recipes/steel_shears.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "X " - ], - "key": { - "X": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "basemetals:steel_shears" - }, - "group": "basemetals:steel_shears" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "X " + ], + "key": { + "X": { + "tag": "forge:ingots/steel" + } + }, + "result": { + "item": "basemetals:steel_shears" + }, + "group": "basemetals:steel_shears" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_shield.json b/src/generated/resources/data/basemetals/recipes/steel_shield.json index 78eaeaea..0b399bc4 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_shield.json +++ b/src/generated/resources/data/basemetals/recipes/steel_shield.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XWX", - "XXX", - " X " - ], - "key": { - "W": { - "tag": "minecraft:planks" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XWX", + "XXX", + " X " + ], + "key": { + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:ingots/steel" + } }, - "X": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "basemetals:steel_shield" - }, - "group": "basemetals:steel_shield" + "result": { + "item": "basemetals:steel_shield" + }, + "group": "basemetals:steel_shield" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_shovel.json b/src/generated/resources/data/basemetals/recipes/steel_shovel.json index 9a100ca7..4a1d7ce8 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/steel_shovel.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/steel" + } }, - "X": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "basemetals:steel_shovel" - }, - "group": "basemetals:steel_shovel" + "result": { + "item": "basemetals:steel_shovel" + }, + "group": "basemetals:steel_shovel" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_slab.json b/src/generated/resources/data/basemetals/recipes/steel_slab.json index 4c16040b..5f001873 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_slab.json +++ b/src/generated/resources/data/basemetals/recipes/steel_slab.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/steel" - } - }, - "result": { - "item": "basemetals:steel_slab", - "count": 6 - }, - "group": "basemetals:steel_slab" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/steel" + } + }, + "result": { + "item": "basemetals:steel_slab", + "count": 6 + }, + "group": "basemetals:steel_slab" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_smallblend.json b/src/generated/resources/data/basemetals/recipes/steel_smallblend.json index 1327a57e..3825defa 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_smallblend.json +++ b/src/generated/resources/data/basemetals/recipes/steel_smallblend.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:blends/steel" - } - ], - "result": { - "item": "basemetals:steel_smallblend", - "count": 9 - }, - "group": "basemetals:steel_smallblend" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:blends/steel" + } + ], + "result": { + "item": "basemetals:steel_smallblend", + "count": 9 + }, + "group": "basemetals:steel_smallblend" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_smallpowder.json b/src/generated/resources/data/basemetals/recipes/steel_smallpowder.json index 62f41684..153d5110 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/steel_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/steel" - } - ], - "result": { - "item": "basemetals:steel_smallpowder", - "count": 9 - }, - "group": "basemetals:steel_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/steel" + } + ], + "result": { + "item": "basemetals:steel_smallpowder", + "count": 9 + }, + "group": "basemetals:steel_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_stairs.json b/src/generated/resources/data/basemetals/recipes/steel_stairs.json index 8f66368c..63c5a74f 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/steel_stairs.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X ", - "XX ", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/steel" - } - }, - "result": { - "item": "basemetals:steel_stairs", - "count": 4 - }, - "group": "basemetals:steel_stairs" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/steel" + } + }, + "result": { + "item": "basemetals:steel_stairs", + "count": 4 + }, + "group": "basemetals:steel_stairs" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_sword.json b/src/generated/resources/data/basemetals/recipes/steel_sword.json index 9d3a79b4..42b07960 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_sword.json +++ b/src/generated/resources/data/basemetals/recipes/steel_sword.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/steel" + } }, - "X": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "basemetals:steel_sword" - }, - "group": "basemetals:steel_sword" + "result": { + "item": "basemetals:steel_sword" + }, + "group": "basemetals:steel_sword" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_trapdoor.json b/src/generated/resources/data/basemetals/recipes/steel_trapdoor.json index d9316e40..eca1aa21 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/steel_trapdoor.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "basemetals:steel_trapdoor" - }, - "group": "basemetals:steel_trapdoor" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/steel" + } + }, + "result": { + "item": "basemetals:steel_trapdoor" + }, + "group": "basemetals:steel_trapdoor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/steel_wall.json b/src/generated/resources/data/basemetals/recipes/steel_wall.json index f69fabae..0d6b4d1a 100644 --- a/src/generated/resources/data/basemetals/recipes/steel_wall.json +++ b/src/generated/resources/data/basemetals/recipes/steel_wall.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/steel" - } - }, - "result": { - "item": "basemetals:steel_wall", - "count": 6 - }, - "group": "basemetals:steel_wall" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/steel" + } + }, + "result": { + "item": "basemetals:steel_wall", + "count": 6 + }, + "group": "basemetals:steel_wall" + } } diff --git a/src/generated/resources/data/basemetals/recipes/stone_anvil.json b/src/generated/resources/data/basemetals/recipes/stone_anvil.json index f1ffbd37..ed410e61 100644 --- a/src/generated/resources/data/basemetals/recipes/stone_anvil.json +++ b/src/generated/resources/data/basemetals/recipes/stone_anvil.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "BBB", - " C ", - "SSS" - ], - "key": { - "B": { - "item": "minecraft:stone_bricks" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "BBB", + " C ", + "SSS" + ], + "key": { + "B": { + "item": "minecraft:stone_bricks" + }, + "C": { + "tag": "forge:stone" + }, + "S": { + "item": "minecraft:stone_slab" + } }, - "C": { - "tag": "forge:stone" + "result": { + "item": "basemetals:stone_anvil" }, - "S": { - "item": "minecraft:stone_slab" - } - }, - "result": { - "item": "basemetals:stone_anvil" - }, - "group": "basemetals:stone_anvil" + "group": "basemetals:stone_anvil" + } } diff --git a/src/generated/resources/data/basemetals/recipes/stone_crackhammer.json b/src/generated/resources/data/basemetals/recipes/stone_crackhammer.json index 37f214f6..b928f4b1 100644 --- a/src/generated/resources/data/basemetals/recipes/stone_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/stone_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "item": "minecraft:stone_bricks" + } }, - "X": { - "item": "minecraft:stone_bricks" - } - }, - "result": { - "item": "basemetals:stone_crackhammer" - }, - "group": "basemetals:stone_crackhammer" + "result": { + "item": "basemetals:stone_crackhammer" + }, + "group": "basemetals:stone_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/stone_scythe.json b/src/generated/resources/data/basemetals/recipes/stone_scythe.json index 0c4aec46..c91944c4 100644 --- a/src/generated/resources/data/basemetals/recipes/stone_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/stone_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:stone" + } }, - "X": { - "tag": "forge:stone" - } - }, - "result": { - "item": "basemetals:stone_scythe" - }, - "group": "basemetals:stone_scythe" + "result": { + "item": "basemetals:stone_scythe" + }, + "group": "basemetals:stone_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_arrow.json b/src/generated/resources/data/basemetals/recipes/tin_arrow.json index cf32a1f5..c9b23b8e 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/tin_arrow.json @@ -1,24 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "N", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "N", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "N": { + "tag": "forge:nuggets/tin" + }, + "R": { + "tag": "forge:rods/tin" + } }, - "N": { - "tag": "forge:nuggets/tin" + "result": { + "item": "basemetals:tin_arrow", + "count": 4 }, - "R": { - "tag": "forge:rods/tin" - } - }, - "result": { - "item": "basemetals:tin_arrow", - "count": 4 - }, - "group": "basemetals:tin_arrow" + "group": "basemetals:tin_arrow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_axe.json b/src/generated/resources/data/basemetals/recipes/tin_axe.json index 04a36752..ccd9ef8e 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_axe.json +++ b/src/generated/resources/data/basemetals/recipes/tin_axe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XS", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XS", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/tin" + } }, - "X": { - "tag": "forge:ingots/tin" - } - }, - "result": { - "item": "basemetals:tin_axe" - }, - "group": "basemetals:tin_axe" + "result": { + "item": "basemetals:tin_axe" + }, + "group": "basemetals:tin_axe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_bars.json b/src/generated/resources/data/basemetals/recipes/tin_bars.json index 67afca5f..daec80f6 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_bars.json +++ b/src/generated/resources/data/basemetals/recipes/tin_bars.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/tin" - } - }, - "result": { - "item": "basemetals:tin_bars", - "count": 16 - }, - "group": "basemetals:tin_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/tin" + } + }, + "result": { + "item": "basemetals:tin_bars", + "count": 16 + }, + "group": "basemetals:tin_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_bars_2.json b/src/generated/resources/data/basemetals/recipes/tin_bars_2.json index c7f595d1..98bac3c3 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/tin_bars_2.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:rods/tin" - } - }, - "result": { - "item": "basemetals:tin_bars", - "count": 4 - }, - "group": "basemetals:tin_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:rods/tin" + } + }, + "result": { + "item": "basemetals:tin_bars", + "count": 4 + }, + "group": "basemetals:tin_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_block.json b/src/generated/resources/data/basemetals/recipes/tin_block.json index 0a2da6e3..51371080 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_block.json +++ b/src/generated/resources/data/basemetals/recipes/tin_block.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/tin" - } - }, - "result": { - "item": "basemetals:tin_block" - }, - "group": "basemetals:tin_block" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/tin" + } + }, + "result": { + "item": "basemetals:tin_block" + }, + "group": "basemetals:tin_block" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_block_ingot.json b/src/generated/resources/data/basemetals/recipes/tin_block_ingot.json index f51de4ff..0f65a2c7 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/tin_block_ingot.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/tin" - } - ], - "result": { - "item": "basemetals:tin_ingot", - "count": 9 - }, - "group": "basemetals:tin_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/tin" + } + ], + "result": { + "item": "basemetals:tin_ingot", + "count": 9 + }, + "group": "basemetals:tin_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_bolt.json b/src/generated/resources/data/basemetals/recipes/tin_bolt.json index 5bd95153..ad0ee7ba 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/tin_bolt.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "R": { + "tag": "forge:rods/tin" + } }, - "R": { - "tag": "forge:rods/tin" - } - }, - "result": { - "item": "basemetals:tin_bolt", - "count": 4 - }, - "group": "basemetals:tin_bolt" + "result": { + "item": "basemetals:tin_bolt", + "count": 4 + }, + "group": "basemetals:tin_bolt" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_boots.json b/src/generated/resources/data/basemetals/recipes/tin_boots.json index aa1b1e61..a8f2365a 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_boots.json +++ b/src/generated/resources/data/basemetals/recipes/tin_boots.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/tin" - } - }, - "result": { - "item": "basemetals:tin_boots" - }, - "group": "basemetals:tin_boots" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/tin" + } + }, + "result": { + "item": "basemetals:tin_boots" + }, + "group": "basemetals:tin_boots" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_bow.json b/src/generated/resources/data/basemetals/recipes/tin_bow.json index a5fc95d9..6f7a6d6a 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_bow.json +++ b/src/generated/resources/data/basemetals/recipes/tin_bow.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " RS", - "R S", - " RS" - ], - "key": { - "R": { - "tag": "forge:rods/tin" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " RS", + "R S", + " RS" + ], + "key": { + "R": { + "tag": "forge:rods/tin" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:tin_bow" - }, - "group": "basemetals:tin_bow" + "result": { + "item": "basemetals:tin_bow" + }, + "group": "basemetals:tin_bow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_button.json b/src/generated/resources/data/basemetals/recipes/tin_button.json index 7265790a..f34c6638 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_button.json +++ b/src/generated/resources/data/basemetals/recipes/tin_button.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:nuggets/tin" - } - }, - "result": { - "item": "basemetals:tin_button" - }, - "group": "basemetals:tin_button" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:nuggets/tin" + } + }, + "result": { + "item": "basemetals:tin_button" + }, + "group": "basemetals:tin_button" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_chestplate.json b/src/generated/resources/data/basemetals/recipes/tin_chestplate.json index 24c82d61..8440d686 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/tin_chestplate.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/tin" - } - }, - "result": { - "item": "basemetals:tin_chestplate" - }, - "group": "basemetals:tin_chestplate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/tin" + } + }, + "result": { + "item": "basemetals:tin_chestplate" + }, + "group": "basemetals:tin_chestplate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_crackhammer.json b/src/generated/resources/data/basemetals/recipes/tin_crackhammer.json index 66424519..ff30d355 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/tin_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:storage_blocks/tin" + } }, - "X": { - "tag": "forge:storage_blocks/tin" - } - }, - "result": { - "item": "basemetals:tin_crackhammer" - }, - "group": "basemetals:tin_crackhammer" + "result": { + "item": "basemetals:tin_crackhammer" + }, + "group": "basemetals:tin_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_crossbow.json b/src/generated/resources/data/basemetals/recipes/tin_crossbow.json index b25602a3..f2e9333c 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/tin_crossbow.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRR", - " SR", - "R G" - ], - "key": { - "G": { - "tag": "forge:gears/tin" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRR", + " SR", + "R G" + ], + "key": { + "G": { + "tag": "forge:gears/tin" + }, + "R": { + "tag": "forge:rods/tin" + }, + "S": { + "item": "minecraft:string" + } }, - "R": { - "tag": "forge:rods/tin" + "result": { + "item": "basemetals:tin_crossbow" }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:tin_crossbow" - }, - "group": "basemetals:tin_crossbow" + "group": "basemetals:tin_crossbow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_door.json b/src/generated/resources/data/basemetals/recipes/tin_door.json index a1f51d35..be5f5544 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_door.json +++ b/src/generated/resources/data/basemetals/recipes/tin_door.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/tin" - } - }, - "result": { - "item": "basemetals:tin_door", - "count": 3 - }, - "group": "basemetals:tin_door" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/tin" + } + }, + "result": { + "item": "basemetals:tin_door", + "count": 3 + }, + "group": "basemetals:tin_door" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_fishingrod.json b/src/generated/resources/data/basemetals/recipes/tin_fishingrod.json index 3216ce85..128db4e0 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/tin_fishingrod.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " R", - " RS", - "R S" - ], - "key": { - "R": { - "tag": "forge:rods/tin" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " R", + " RS", + "R S" + ], + "key": { + "R": { + "tag": "forge:rods/tin" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:tin_fishing_rod" - }, - "group": "basemetals:tin_fishing_rod" + "result": { + "item": "basemetals:tin_fishing_rod" + }, + "group": "basemetals:tin_fishing_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_gear.json b/src/generated/resources/data/basemetals/recipes/tin_gear.json index 9f597412..d979ec2f 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_gear.json +++ b/src/generated/resources/data/basemetals/recipes/tin_gear.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "XRX", - " X " - ], - "key": { - "R": { - "tag": "forge:rods/tin" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XRX", + " X " + ], + "key": { + "R": { + "tag": "forge:rods/tin" + }, + "X": { + "tag": "forge:ingots/tin" + } }, - "X": { - "tag": "forge:ingots/tin" - } - }, - "result": { - "item": "basemetals:tin_gear", - "count": 4 - }, - "group": "basemetals:tin_gear" + "result": { + "item": "basemetals:tin_gear", + "count": 4 + }, + "group": "basemetals:tin_gear" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_helmet.json b/src/generated/resources/data/basemetals/recipes/tin_helmet.json index a5db91fc..2e66c583 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/tin_helmet.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/tin" - } - }, - "result": { - "item": "basemetals:tin_helmet" - }, - "group": "basemetals:tin_helmet" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/tin" + } + }, + "result": { + "item": "basemetals:tin_helmet" + }, + "group": "basemetals:tin_helmet" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_hoe.json b/src/generated/resources/data/basemetals/recipes/tin_hoe.json index 488ef267..2d9f24d7 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/tin_hoe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - " S", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " S", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/tin" + } }, - "X": { - "tag": "forge:ingots/tin" - } - }, - "result": { - "item": "basemetals:tin_hoe" - }, - "group": "basemetals:tin_hoe" + "result": { + "item": "basemetals:tin_hoe" + }, + "group": "basemetals:tin_hoe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_horsearmor.json b/src/generated/resources/data/basemetals/recipes/tin_horsearmor.json index 3e320212..d10a20a4 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/tin_horsearmor.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "XWX", - "XXX" - ], - "key": { - "W": { - "tag": "minecraft:wool" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "XWX", + "XXX" + ], + "key": { + "W": { + "tag": "minecraft:wool" + }, + "X": { + "tag": "forge:ingots/tin" + } }, - "X": { - "tag": "forge:ingots/tin" - } - }, - "result": { - "item": "basemetals:tin_horse_armor" - }, - "group": "basemetals:tin_horse_armor" + "result": { + "item": "basemetals:tin_horse_armor" + }, + "group": "basemetals:tin_horse_armor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/tin_ingot_from_nuggets.json index 42b544d8..d9edb44d 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/tin_ingot_from_nuggets.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:nuggets/tin" - } - }, - "result": { - "item": "basemetals:tin_ingot" - }, - "group": "basemetals:tin_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:nuggets/tin" + } + }, + "result": { + "item": "basemetals:tin_ingot" + }, + "group": "basemetals:tin_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_leggings.json b/src/generated/resources/data/basemetals/recipes/tin_leggings.json index 9f9af9ad..de2285c5 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/tin_leggings.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/tin" - } - }, - "result": { - "item": "basemetals:tin_leggings" - }, - "group": "basemetals:tin_leggings" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/tin" + } + }, + "result": { + "item": "basemetals:tin_leggings" + }, + "group": "basemetals:tin_leggings" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_lever.json b/src/generated/resources/data/basemetals/recipes/tin_lever.json index 96455ce0..5ceece29 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_lever.json +++ b/src/generated/resources/data/basemetals/recipes/tin_lever.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "X" - ], - "key": { - "R": { - "tag": "forge:rods/tin" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "X" + ], + "key": { + "R": { + "tag": "forge:rods/tin" + }, + "X": { + "tag": "forge:ingots/tin" + } }, - "X": { - "tag": "forge:ingots/tin" - } - }, - "result": { - "item": "basemetals:tin_lever" - }, - "group": "basemetals:tin_lever" + "result": { + "item": "basemetals:tin_lever" + }, + "group": "basemetals:tin_lever" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_nuggets.json b/src/generated/resources/data/basemetals/recipes/tin_nuggets.json index 5838b2e0..8f5bf3f3 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/tin_nuggets.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:ingots/tin" - } - ], - "result": { - "item": "basemetals:tin_nugget", - "count": 9 - }, - "group": "basemetals:tin_nugget" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/tin" + } + ], + "result": { + "item": "basemetals:tin_nugget", + "count": 9 + }, + "group": "basemetals:tin_nugget" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_pickaxe.json b/src/generated/resources/data/basemetals/recipes/tin_pickaxe.json index 10cdffa8..22b0c622 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/tin_pickaxe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " S ", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " S ", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/tin" + } }, - "X": { - "tag": "forge:ingots/tin" - } - }, - "result": { - "item": "basemetals:tin_pickaxe" - }, - "group": "basemetals:tin_pickaxe" + "result": { + "item": "basemetals:tin_pickaxe" + }, + "group": "basemetals:tin_pickaxe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_plate.json b/src/generated/resources/data/basemetals/recipes/tin_plate.json index c2948f64..22d4b4b1 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_plate.json +++ b/src/generated/resources/data/basemetals/recipes/tin_plate.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/tin" - } - }, - "result": { - "item": "basemetals:tin_plate", - "count": 3 - }, - "group": "basemetals:tin_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/tin" + } + }, + "result": { + "item": "basemetals:tin_plate", + "count": 3 + }, + "group": "basemetals:tin_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/tin_powder_from_small.json index d3ee2f37..2ff753f9 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/tin_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/tin" - } - }, - "result": { - "item": "basemetals:tin_powder" - }, - "group": "basemetals:tin_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/tin" + } + }, + "result": { + "item": "basemetals:tin_powder" + }, + "group": "basemetals:tin_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/tin_pressure_plate.json index 2dfb1305..7b125d73 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/tin_pressure_plate.json @@ -1,15 +1,18 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/tin" - } - }, - "result": { - "item": "basemetals:tin_pressure_plate" - }, - "group": "basemetals:tin_pressure_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/tin" + } + }, + "result": { + "item": "basemetals:tin_pressure_plate" + }, + "group": "basemetals:tin_pressure_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_rod.json b/src/generated/resources/data/basemetals/recipes/tin_rod.json index 5b3898e4..c1ed5979 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_rod.json +++ b/src/generated/resources/data/basemetals/recipes/tin_rod.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:ingots/tin" - } - }, - "result": { - "item": "basemetals:tin_rod", - "count": 4 - }, - "group": "basemetals:tin_rod" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:ingots/tin" + } + }, + "result": { + "item": "basemetals:tin_rod", + "count": 4 + }, + "group": "basemetals:tin_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_scythe.json b/src/generated/resources/data/basemetals/recipes/tin_scythe.json index 2d64bf88..03df34b5 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/tin_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/tin" + } }, - "X": { - "tag": "forge:ingots/tin" - } - }, - "result": { - "item": "basemetals:tin_scythe" - }, - "group": "basemetals:tin_scythe" + "result": { + "item": "basemetals:tin_scythe" + }, + "group": "basemetals:tin_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_shears.json b/src/generated/resources/data/basemetals/recipes/tin_shears.json index 28e3423d..ae196c7d 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_shears.json +++ b/src/generated/resources/data/basemetals/recipes/tin_shears.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "X " - ], - "key": { - "X": { - "tag": "forge:ingots/tin" - } - }, - "result": { - "item": "basemetals:tin_shears" - }, - "group": "basemetals:tin_shears" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "X " + ], + "key": { + "X": { + "tag": "forge:ingots/tin" + } + }, + "result": { + "item": "basemetals:tin_shears" + }, + "group": "basemetals:tin_shears" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_shield.json b/src/generated/resources/data/basemetals/recipes/tin_shield.json index d27b67c8..4664e442 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_shield.json +++ b/src/generated/resources/data/basemetals/recipes/tin_shield.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XWX", - "XXX", - " X " - ], - "key": { - "W": { - "tag": "minecraft:planks" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XWX", + "XXX", + " X " + ], + "key": { + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:ingots/tin" + } }, - "X": { - "tag": "forge:ingots/tin" - } - }, - "result": { - "item": "basemetals:tin_shield" - }, - "group": "basemetals:tin_shield" + "result": { + "item": "basemetals:tin_shield" + }, + "group": "basemetals:tin_shield" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_shovel.json b/src/generated/resources/data/basemetals/recipes/tin_shovel.json index 62b0fd04..c6abad7b 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/tin_shovel.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/tin" + } }, - "X": { - "tag": "forge:ingots/tin" - } - }, - "result": { - "item": "basemetals:tin_shovel" - }, - "group": "basemetals:tin_shovel" + "result": { + "item": "basemetals:tin_shovel" + }, + "group": "basemetals:tin_shovel" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_slab.json b/src/generated/resources/data/basemetals/recipes/tin_slab.json index e211efa5..37b9c410 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_slab.json +++ b/src/generated/resources/data/basemetals/recipes/tin_slab.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/tin" - } - }, - "result": { - "item": "basemetals:tin_slab", - "count": 6 - }, - "group": "basemetals:tin_slab" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/tin" + } + }, + "result": { + "item": "basemetals:tin_slab", + "count": 6 + }, + "group": "basemetals:tin_slab" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_smallpowder.json b/src/generated/resources/data/basemetals/recipes/tin_smallpowder.json index 9c00c316..eb890156 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/tin_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/tin" - } - ], - "result": { - "item": "basemetals:tin_smallpowder", - "count": 9 - }, - "group": "basemetals:tin_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/tin" + } + ], + "result": { + "item": "basemetals:tin_smallpowder", + "count": 9 + }, + "group": "basemetals:tin_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_stairs.json b/src/generated/resources/data/basemetals/recipes/tin_stairs.json index 8a2e8f7f..02006dda 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/tin_stairs.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X ", - "XX ", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/tin" - } - }, - "result": { - "item": "basemetals:tin_stairs", - "count": 4 - }, - "group": "basemetals:tin_stairs" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/tin" + } + }, + "result": { + "item": "basemetals:tin_stairs", + "count": 4 + }, + "group": "basemetals:tin_stairs" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_sword.json b/src/generated/resources/data/basemetals/recipes/tin_sword.json index b583f602..817b7356 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_sword.json +++ b/src/generated/resources/data/basemetals/recipes/tin_sword.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/tin" + } }, - "X": { - "tag": "forge:ingots/tin" - } - }, - "result": { - "item": "basemetals:tin_sword" - }, - "group": "basemetals:tin_sword" + "result": { + "item": "basemetals:tin_sword" + }, + "group": "basemetals:tin_sword" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_trapdoor.json b/src/generated/resources/data/basemetals/recipes/tin_trapdoor.json index b4fa4301..d665a415 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/tin_trapdoor.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/tin" - } - }, - "result": { - "item": "basemetals:tin_trapdoor" - }, - "group": "basemetals:tin_trapdoor" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/tin" + } + }, + "result": { + "item": "basemetals:tin_trapdoor" + }, + "group": "basemetals:tin_trapdoor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tin_wall.json b/src/generated/resources/data/basemetals/recipes/tin_wall.json index 13087694..040b39de 100644 --- a/src/generated/resources/data/basemetals/recipes/tin_wall.json +++ b/src/generated/resources/data/basemetals/recipes/tin_wall.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/tin" - } - }, - "result": { - "item": "basemetals:tin_wall", - "count": 6 - }, - "group": "basemetals:tin_wall" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/tin" + } + }, + "result": { + "item": "basemetals:tin_wall", + "count": 6 + }, + "group": "basemetals:tin_wall" + } } diff --git a/src/generated/resources/data/basemetals/recipes/tripwire_hook.json b/src/generated/resources/data/basemetals/recipes/tripwire_hook.json index 00943454..63d1f5be 100644 --- a/src/generated/resources/data/basemetals/recipes/tripwire_hook.json +++ b/src/generated/resources/data/basemetals/recipes/tripwire_hook.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "W" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "W" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:ingots/steel" + } }, - "W": { - "tag": "minecraft:planks" + "result": { + "item": "minecraft:tripwire_hook" }, - "X": { - "tag": "forge:ingots/steel" - } - }, - "result": { - "item": "minecraft:tripwire_hook" - }, - "group": "minecraft:tripwire_hook" + "group": "minecraft:tripwire_hook" + } } diff --git a/src/generated/resources/data/basemetals/recipes/wood_crackhammer.json b/src/generated/resources/data/basemetals/recipes/wood_crackhammer.json index 64af3d30..4219b093 100644 --- a/src/generated/resources/data/basemetals/recipes/wood_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/wood_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "minecraft:logs" + } }, - "X": { - "tag": "minecraft:logs" - } - }, - "result": { - "item": "basemetals:wood_crackhammer" - }, - "group": "basemetals:wood_crackhammer" + "result": { + "item": "basemetals:wood_crackhammer" + }, + "group": "basemetals:wood_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/wood_scythe.json b/src/generated/resources/data/basemetals/recipes/wood_scythe.json index e7124831..4a4eddf3 100644 --- a/src/generated/resources/data/basemetals/recipes/wood_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/wood_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "minecraft:planks" + } }, - "X": { - "tag": "minecraft:planks" - } - }, - "result": { - "item": "basemetals:wood_scythe" - }, - "group": "basemetals:wood_scythe" + "result": { + "item": "basemetals:wood_scythe" + }, + "group": "basemetals:wood_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_arrow.json b/src/generated/resources/data/basemetals/recipes/zinc_arrow.json index 035b5789..e05b9737 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_arrow.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_arrow.json @@ -1,24 +1,27 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "N", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "N", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "N": { + "tag": "forge:nuggets/zinc" + }, + "R": { + "tag": "forge:rods/zinc" + } }, - "N": { - "tag": "forge:nuggets/zinc" + "result": { + "item": "basemetals:zinc_arrow", + "count": 4 }, - "R": { - "tag": "forge:rods/zinc" - } - }, - "result": { - "item": "basemetals:zinc_arrow", - "count": 4 - }, - "group": "basemetals:zinc_arrow" + "group": "basemetals:zinc_arrow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_axe.json b/src/generated/resources/data/basemetals/recipes/zinc_axe.json index 8c7e54f2..68f364ae 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_axe.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_axe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XS", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XS", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/zinc" + } }, - "X": { - "tag": "forge:ingots/zinc" - } - }, - "result": { - "item": "basemetals:zinc_axe" - }, - "group": "basemetals:zinc_axe" + "result": { + "item": "basemetals:zinc_axe" + }, + "group": "basemetals:zinc_axe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_bars.json b/src/generated/resources/data/basemetals/recipes/zinc_bars.json index dfb5dc96..6ba2bd76 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_bars.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_bars.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/zinc" - } - }, - "result": { - "item": "basemetals:zinc_bars", - "count": 16 - }, - "group": "basemetals:zinc_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/zinc" + } + }, + "result": { + "item": "basemetals:zinc_bars", + "count": 16 + }, + "group": "basemetals:zinc_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_bars_2.json b/src/generated/resources/data/basemetals/recipes/zinc_bars_2.json index 2748faf2..4e9c9bb7 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_bars_2.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_bars_2.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:rods/zinc" - } - }, - "result": { - "item": "basemetals:zinc_bars", - "count": 4 - }, - "group": "basemetals:zinc_bars" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:rods/zinc" + } + }, + "result": { + "item": "basemetals:zinc_bars", + "count": 4 + }, + "group": "basemetals:zinc_bars" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_block.json b/src/generated/resources/data/basemetals/recipes/zinc_block.json index a67f361f..04bdb348 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_block.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_block.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/zinc" - } - }, - "result": { - "item": "basemetals:zinc_block" - }, - "group": "basemetals:zinc_block" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/zinc" + } + }, + "result": { + "item": "basemetals:zinc_block" + }, + "group": "basemetals:zinc_block" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_block_ingot.json b/src/generated/resources/data/basemetals/recipes/zinc_block_ingot.json index dc2c1428..780e3974 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_block_ingot.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_block_ingot.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:storage_blocks/zinc" - } - ], - "result": { - "item": "basemetals:zinc_ingot", - "count": 9 - }, - "group": "basemetals:zinc_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:storage_blocks/zinc" + } + ], + "result": { + "item": "basemetals:zinc_ingot", + "count": 9 + }, + "group": "basemetals:zinc_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_bolt.json b/src/generated/resources/data/basemetals/recipes/zinc_bolt.json index 457d83f6..b339db49 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_bolt.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_bolt.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "R", - "F" - ], - "key": { - "F": { - "item": "minecraft:feather" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "R", + "F" + ], + "key": { + "F": { + "item": "minecraft:feather" + }, + "R": { + "tag": "forge:rods/zinc" + } }, - "R": { - "tag": "forge:rods/zinc" - } - }, - "result": { - "item": "basemetals:zinc_bolt", - "count": 4 - }, - "group": "basemetals:zinc_bolt" + "result": { + "item": "basemetals:zinc_bolt", + "count": 4 + }, + "group": "basemetals:zinc_bolt" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_boots.json b/src/generated/resources/data/basemetals/recipes/zinc_boots.json index b6358104..f87b8d9e 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_boots.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_boots.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/zinc" - } - }, - "result": { - "item": "basemetals:zinc_boots" - }, - "group": "basemetals:zinc_boots" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/zinc" + } + }, + "result": { + "item": "basemetals:zinc_boots" + }, + "group": "basemetals:zinc_boots" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_bow.json b/src/generated/resources/data/basemetals/recipes/zinc_bow.json index 8911cf8a..3f3969de 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_bow.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_bow.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " RS", - "R S", - " RS" - ], - "key": { - "R": { - "tag": "forge:rods/zinc" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " RS", + "R S", + " RS" + ], + "key": { + "R": { + "tag": "forge:rods/zinc" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:zinc_bow" - }, - "group": "basemetals:zinc_bow" + "result": { + "item": "basemetals:zinc_bow" + }, + "group": "basemetals:zinc_bow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_button.json b/src/generated/resources/data/basemetals/recipes/zinc_button.json index a3ab3295..2a48c5fd 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_button.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_button.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:nuggets/zinc" - } - }, - "result": { - "item": "basemetals:zinc_button" - }, - "group": "basemetals:zinc_button" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:nuggets/zinc" + } + }, + "result": { + "item": "basemetals:zinc_button" + }, + "group": "basemetals:zinc_button" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_chestplate.json b/src/generated/resources/data/basemetals/recipes/zinc_chestplate.json index 51f93be7..aa661a46 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_chestplate.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_chestplate.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X X", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/zinc" - } - }, - "result": { - "item": "basemetals:zinc_chestplate" - }, - "group": "basemetals:zinc_chestplate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X X", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/zinc" + } + }, + "result": { + "item": "basemetals:zinc_chestplate" + }, + "group": "basemetals:zinc_chestplate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_crackhammer.json b/src/generated/resources/data/basemetals/recipes/zinc_crackhammer.json index a6c6bf5e..90b7fb70 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_crackhammer.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_crackhammer.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:storage_blocks/zinc" + } }, - "X": { - "tag": "forge:storage_blocks/zinc" - } - }, - "result": { - "item": "basemetals:zinc_crackhammer" - }, - "group": "basemetals:zinc_crackhammer" + "result": { + "item": "basemetals:zinc_crackhammer" + }, + "group": "basemetals:zinc_crackhammer" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_crossbow.json b/src/generated/resources/data/basemetals/recipes/zinc_crossbow.json index 167ba114..d61d0423 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_crossbow.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_crossbow.json @@ -1,23 +1,26 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "GRR", - " SR", - "R G" - ], - "key": { - "G": { - "tag": "forge:gears/zinc" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "GRR", + " SR", + "R G" + ], + "key": { + "G": { + "tag": "forge:gears/zinc" + }, + "R": { + "tag": "forge:rods/zinc" + }, + "S": { + "item": "minecraft:string" + } }, - "R": { - "tag": "forge:rods/zinc" + "result": { + "item": "basemetals:zinc_crossbow" }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:zinc_crossbow" - }, - "group": "basemetals:zinc_crossbow" + "group": "basemetals:zinc_crossbow" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_door.json b/src/generated/resources/data/basemetals/recipes/zinc_door.json index cbeb4bf5..cd38b002 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_door.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_door.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/zinc" - } - }, - "result": { - "item": "basemetals:zinc_door", - "count": 3 - }, - "group": "basemetals:zinc_door" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/zinc" + } + }, + "result": { + "item": "basemetals:zinc_door", + "count": 3 + }, + "group": "basemetals:zinc_door" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_fishingrod.json b/src/generated/resources/data/basemetals/recipes/zinc_fishingrod.json index db916e84..efc5ac3a 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_fishingrod.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_fishingrod.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " R", - " RS", - "R S" - ], - "key": { - "R": { - "tag": "forge:rods/zinc" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " R", + " RS", + "R S" + ], + "key": { + "R": { + "tag": "forge:rods/zinc" + }, + "S": { + "item": "minecraft:string" + } }, - "S": { - "item": "minecraft:string" - } - }, - "result": { - "item": "basemetals:zinc_fishing_rod" - }, - "group": "basemetals:zinc_fishing_rod" + "result": { + "item": "basemetals:zinc_fishing_rod" + }, + "group": "basemetals:zinc_fishing_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_gear.json b/src/generated/resources/data/basemetals/recipes/zinc_gear.json index c5578042..b98d4d8d 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_gear.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_gear.json @@ -1,21 +1,24 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X ", - "XRX", - " X " - ], - "key": { - "R": { - "tag": "forge:rods/zinc" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X ", + "XRX", + " X " + ], + "key": { + "R": { + "tag": "forge:rods/zinc" + }, + "X": { + "tag": "forge:ingots/zinc" + } }, - "X": { - "tag": "forge:ingots/zinc" - } - }, - "result": { - "item": "basemetals:zinc_gear", - "count": 4 - }, - "group": "basemetals:zinc_gear" + "result": { + "item": "basemetals:zinc_gear", + "count": 4 + }, + "group": "basemetals:zinc_gear" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_helmet.json b/src/generated/resources/data/basemetals/recipes/zinc_helmet.json index 11dca9e5..254c081d 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_helmet.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_helmet.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/zinc" - } - }, - "result": { - "item": "basemetals:zinc_helmet" - }, - "group": "basemetals:zinc_helmet" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/zinc" + } + }, + "result": { + "item": "basemetals:zinc_helmet" + }, + "group": "basemetals:zinc_helmet" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_hoe.json b/src/generated/resources/data/basemetals/recipes/zinc_hoe.json index ed504371..9640a362 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_hoe.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_hoe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - " S", - " S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + " S", + " S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/zinc" + } }, - "X": { - "tag": "forge:ingots/zinc" - } - }, - "result": { - "item": "basemetals:zinc_hoe" - }, - "group": "basemetals:zinc_hoe" + "result": { + "item": "basemetals:zinc_hoe" + }, + "group": "basemetals:zinc_hoe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_horsearmor.json b/src/generated/resources/data/basemetals/recipes/zinc_horsearmor.json index 0509711d..321b5b5e 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_horsearmor.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_horsearmor.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "XWX", - "XXX" - ], - "key": { - "W": { - "tag": "minecraft:wool" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "XWX", + "XXX" + ], + "key": { + "W": { + "tag": "minecraft:wool" + }, + "X": { + "tag": "forge:ingots/zinc" + } }, - "X": { - "tag": "forge:ingots/zinc" - } - }, - "result": { - "item": "basemetals:zinc_horse_armor" - }, - "group": "basemetals:zinc_horse_armor" + "result": { + "item": "basemetals:zinc_horse_armor" + }, + "group": "basemetals:zinc_horse_armor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_ingot_from_nuggets.json b/src/generated/resources/data/basemetals/recipes/zinc_ingot_from_nuggets.json index a64d540a..aba6cca7 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_ingot_from_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_ingot_from_nuggets.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:nuggets/zinc" - } - }, - "result": { - "item": "basemetals:zinc_ingot" - }, - "group": "basemetals:zinc_ingot" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:nuggets/zinc" + } + }, + "result": { + "item": "basemetals:zinc_ingot" + }, + "group": "basemetals:zinc_ingot" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_leggings.json b/src/generated/resources/data/basemetals/recipes/zinc_leggings.json index c56e615f..e3ce7b5a 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_leggings.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_leggings.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "X X", - "X X" - ], - "key": { - "X": { - "tag": "forge:ingots/zinc" - } - }, - "result": { - "item": "basemetals:zinc_leggings" - }, - "group": "basemetals:zinc_leggings" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "X X", + "X X" + ], + "key": { + "X": { + "tag": "forge:ingots/zinc" + } + }, + "result": { + "item": "basemetals:zinc_leggings" + }, + "group": "basemetals:zinc_leggings" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_lever.json b/src/generated/resources/data/basemetals/recipes/zinc_lever.json index 27c79338..3cdbfdd0 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_lever.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_lever.json @@ -1,19 +1,22 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "R", - "X" - ], - "key": { - "R": { - "tag": "forge:rods/zinc" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "R", + "X" + ], + "key": { + "R": { + "tag": "forge:rods/zinc" + }, + "X": { + "tag": "forge:ingots/zinc" + } }, - "X": { - "tag": "forge:ingots/zinc" - } - }, - "result": { - "item": "basemetals:zinc_lever" - }, - "group": "basemetals:zinc_lever" + "result": { + "item": "basemetals:zinc_lever" + }, + "group": "basemetals:zinc_lever" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_nuggets.json b/src/generated/resources/data/basemetals/recipes/zinc_nuggets.json index b962b6f1..19ab2a41 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_nuggets.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_nuggets.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:ingots/zinc" - } - ], - "result": { - "item": "basemetals:zinc_nugget", - "count": 9 - }, - "group": "basemetals:zinc_nugget" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:ingots/zinc" + } + ], + "result": { + "item": "basemetals:zinc_nugget", + "count": 9 + }, + "group": "basemetals:zinc_nugget" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_pickaxe.json b/src/generated/resources/data/basemetals/recipes/zinc_pickaxe.json index 950dedf1..4437396b 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_pickaxe.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_pickaxe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - " S ", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + " S ", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/zinc" + } }, - "X": { - "tag": "forge:ingots/zinc" - } - }, - "result": { - "item": "basemetals:zinc_pickaxe" - }, - "group": "basemetals:zinc_pickaxe" + "result": { + "item": "basemetals:zinc_pickaxe" + }, + "group": "basemetals:zinc_pickaxe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_plate.json b/src/generated/resources/data/basemetals/recipes/zinc_plate.json index 0c0ace26..5d9ee959 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_plate.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_plate.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:ingots/zinc" - } - }, - "result": { - "item": "basemetals:zinc_plate", - "count": 3 - }, - "group": "basemetals:zinc_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:ingots/zinc" + } + }, + "result": { + "item": "basemetals:zinc_plate", + "count": 3 + }, + "group": "basemetals:zinc_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_powder_from_small.json b/src/generated/resources/data/basemetals/recipes/zinc_powder_from_small.json index 676919f2..20dcf3e7 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_powder_from_small.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_powder_from_small.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:tiny_dusts/zinc" - } - }, - "result": { - "item": "basemetals:zinc_powder" - }, - "group": "basemetals:zinc_powder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:tiny_dusts/zinc" + } + }, + "result": { + "item": "basemetals:zinc_powder" + }, + "group": "basemetals:zinc_powder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_pressure_plate.json b/src/generated/resources/data/basemetals/recipes/zinc_pressure_plate.json index a7f06f2e..981c13f4 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_pressure_plate.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_pressure_plate.json @@ -1,15 +1,18 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/zinc" - } - }, - "result": { - "item": "basemetals:zinc_pressure_plate" - }, - "group": "basemetals:zinc_pressure_plate" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/zinc" + } + }, + "result": { + "item": "basemetals:zinc_pressure_plate" + }, + "group": "basemetals:zinc_pressure_plate" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_rod.json b/src/generated/resources/data/basemetals/recipes/zinc_rod.json index 0c62e7ef..3153e6f2 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_rod.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_rod.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X" - ], - "key": { - "X": { - "tag": "forge:ingots/zinc" - } - }, - "result": { - "item": "basemetals:zinc_rod", - "count": 4 - }, - "group": "basemetals:zinc_rod" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X" + ], + "key": { + "X": { + "tag": "forge:ingots/zinc" + } + }, + "result": { + "item": "basemetals:zinc_rod", + "count": 4 + }, + "group": "basemetals:zinc_rod" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_scythe.json b/src/generated/resources/data/basemetals/recipes/zinc_scythe.json index b2acea08..fd748427 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_scythe.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_scythe.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX ", - " X", - " S " - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX ", + " X", + " S " + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/zinc" + } }, - "X": { - "tag": "forge:ingots/zinc" - } - }, - "result": { - "item": "basemetals:zinc_scythe" - }, - "group": "basemetals:zinc_scythe" + "result": { + "item": "basemetals:zinc_scythe" + }, + "group": "basemetals:zinc_scythe" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_shears.json b/src/generated/resources/data/basemetals/recipes/zinc_shears.json index ab16808e..b0d1cfa7 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_shears.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_shears.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - " X", - "X " - ], - "key": { - "X": { - "tag": "forge:ingots/zinc" - } - }, - "result": { - "item": "basemetals:zinc_shears" - }, - "group": "basemetals:zinc_shears" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + " X", + "X " + ], + "key": { + "X": { + "tag": "forge:ingots/zinc" + } + }, + "result": { + "item": "basemetals:zinc_shears" + }, + "group": "basemetals:zinc_shears" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_shield.json b/src/generated/resources/data/basemetals/recipes/zinc_shield.json index da509aa1..846923a4 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_shield.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_shield.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XWX", - "XXX", - " X " - ], - "key": { - "W": { - "tag": "minecraft:planks" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XWX", + "XXX", + " X " + ], + "key": { + "W": { + "tag": "minecraft:planks" + }, + "X": { + "tag": "forge:ingots/zinc" + } }, - "X": { - "tag": "forge:ingots/zinc" - } - }, - "result": { - "item": "basemetals:zinc_shield" - }, - "group": "basemetals:zinc_shield" + "result": { + "item": "basemetals:zinc_shield" + }, + "group": "basemetals:zinc_shield" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_shovel.json b/src/generated/resources/data/basemetals/recipes/zinc_shovel.json index 0f073696..f801bc11 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_shovel.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_shovel.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "S", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "S", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/zinc" + } }, - "X": { - "tag": "forge:ingots/zinc" - } - }, - "result": { - "item": "basemetals:zinc_shovel" - }, - "group": "basemetals:zinc_shovel" + "result": { + "item": "basemetals:zinc_shovel" + }, + "group": "basemetals:zinc_shovel" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_slab.json b/src/generated/resources/data/basemetals/recipes/zinc_slab.json index 9d834d20..01388407 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_slab.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_slab.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/zinc" - } - }, - "result": { - "item": "basemetals:zinc_slab", - "count": 6 - }, - "group": "basemetals:zinc_slab" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/zinc" + } + }, + "result": { + "item": "basemetals:zinc_slab", + "count": 6 + }, + "group": "basemetals:zinc_slab" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_smallpowder.json b/src/generated/resources/data/basemetals/recipes/zinc_smallpowder.json index 5a6e0daa..f136d687 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_smallpowder.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_smallpowder.json @@ -1,13 +1,16 @@ { - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "tag": "forge:dusts/zinc" - } - ], - "result": { - "item": "basemetals:zinc_smallpowder", - "count": 9 - }, - "group": "basemetals:zinc_smallpowder" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "tag": "forge:dusts/zinc" + } + ], + "result": { + "item": "basemetals:zinc_smallpowder", + "count": 9 + }, + "group": "basemetals:zinc_smallpowder" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_stairs.json b/src/generated/resources/data/basemetals/recipes/zinc_stairs.json index 1fdb01a9..a45fb4da 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_stairs.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_stairs.json @@ -1,18 +1,21 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X ", - "XX ", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/zinc" - } - }, - "result": { - "item": "basemetals:zinc_stairs", - "count": 4 - }, - "group": "basemetals:zinc_stairs" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/zinc" + } + }, + "result": { + "item": "basemetals:zinc_stairs", + "count": 4 + }, + "group": "basemetals:zinc_stairs" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_sword.json b/src/generated/resources/data/basemetals/recipes/zinc_sword.json index 3455ca9f..8967947d 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_sword.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_sword.json @@ -1,20 +1,23 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "X", - "X", - "S" - ], - "key": { - "S": { - "tag": "forge:rods/wooden" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "X", + "X", + "S" + ], + "key": { + "S": { + "tag": "forge:rods/wooden" + }, + "X": { + "tag": "forge:ingots/zinc" + } }, - "X": { - "tag": "forge:ingots/zinc" - } - }, - "result": { - "item": "basemetals:zinc_sword" - }, - "group": "basemetals:zinc_sword" + "result": { + "item": "basemetals:zinc_sword" + }, + "group": "basemetals:zinc_sword" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_trapdoor.json b/src/generated/resources/data/basemetals/recipes/zinc_trapdoor.json index 79cf3f14..d0521766 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_trapdoor.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_trapdoor.json @@ -1,16 +1,19 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XX", - "XX" - ], - "key": { - "X": { - "tag": "forge:ingots/zinc" - } - }, - "result": { - "item": "basemetals:zinc_trapdoor" - }, - "group": "basemetals:zinc_trapdoor" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XX", + "XX" + ], + "key": { + "X": { + "tag": "forge:ingots/zinc" + } + }, + "result": { + "item": "basemetals:zinc_trapdoor" + }, + "group": "basemetals:zinc_trapdoor" + } } diff --git a/src/generated/resources/data/basemetals/recipes/zinc_wall.json b/src/generated/resources/data/basemetals/recipes/zinc_wall.json index 5a190cfd..2236af91 100644 --- a/src/generated/resources/data/basemetals/recipes/zinc_wall.json +++ b/src/generated/resources/data/basemetals/recipes/zinc_wall.json @@ -1,17 +1,20 @@ { - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX" - ], - "key": { - "X": { - "tag": "forge:storage_blocks/zinc" - } - }, - "result": { - "item": "basemetals:zinc_wall", - "count": 6 - }, - "group": "basemetals:zinc_wall" + "type": "basemetals:content_crafting", + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "XXX", + "XXX" + ], + "key": { + "X": { + "tag": "forge:storage_blocks/zinc" + } + }, + "result": { + "item": "basemetals:zinc_wall", + "count": 6 + }, + "group": "basemetals:zinc_wall" + } } diff --git a/src/generated/resources/data/basemetals/registry_manifest.json b/src/generated/resources/data/basemetals/registry_manifest.json index d89cc0da..e2772a91 100644 --- a/src/generated/resources/data/basemetals/registry_manifest.json +++ b/src/generated/resources/data/basemetals/registry_manifest.json @@ -1559,6 +1559,7 @@ "basemetals:custom_bolt" ], "recipe_serializers": [ + "basemetals:content_crafting", "basemetals:crushing", "basemetals:legacy_smelting", "basemetals:plate_repair" @@ -1701,6 +1702,7 @@ "basemetals:custom_bolt" ], "new_recipe_serializers": [ + "basemetals:content_crafting", "basemetals:crushing", "basemetals:legacy_smelting", "basemetals:plate_repair" diff --git a/src/integrationTest/java/zone/moddev/mc/basemetals/testmod/BaseMetalsRuntimeProbe.java b/src/integrationTest/java/zone/moddev/mc/basemetals/testmod/BaseMetalsRuntimeProbe.java index ec8d106e..92dba1e8 100644 --- a/src/integrationTest/java/zone/moddev/mc/basemetals/testmod/BaseMetalsRuntimeProbe.java +++ b/src/integrationTest/java/zone/moddev/mc/basemetals/testmod/BaseMetalsRuntimeProbe.java @@ -92,10 +92,55 @@ public final class BaseMetalsRuntimeProbe { public BaseMetalsRuntimeProbe() { MinecraftForge.EVENT_BUS.addListener(this::serverStarted); + MinecraftForge.EVENT_BUS.addListener(net.minecraftforge.eventbus.api.EventPriority.LOWEST, this::login); + } + + private void login(net.minecraftforge.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent event) { + if (!"login".equals(System.getProperty("basemetalsprobe.mode"))) return; + event.getPlayer().inventory.setInventorySlotContents(0, + new ItemStack(ModContent.item("tin_bow").get())); + if (Boolean.getBoolean("basemetalsprobe.modeSwitch")) { + net.minecraft.entity.player.EntityPlayerMP player = (net.minecraft.entity.player.EntityPlayerMP) event.getPlayer(); + if (zone.moddev.mc.basemetals.config.BaseMetalsConfig.activeMode() + == zone.moddev.mc.basemetals.config.ContentMode.LOW_FANTASY) { + player.inventory.setInventorySlotContents(1, new ItemStack(ModContent.item("tin_ingot").get())); + player.inventory.setInventorySlotContents(2, new ItemStack(ModContent.item("adamantine_ingot").get())); + // Also save progress earned through the original 1.13 rod criterion. + player.inventory.setInventorySlotContents(3, new ItemStack(ModContent.item("steel_rod").get())); + net.minecraft.advancements.CriteriaTriggers.INVENTORY_CHANGED.trigger(player, player.inventory); + } + + for (String name : new String[] {"tin_bow", "steel_bow", "adamantine_bow", "adamantine_crossbow", "adamantine_gear", + "adamantine_arrow", "adamantine_rod", "adamantine_pickaxe"}) { + net.minecraft.advancements.Advancement advancement = player.getServer().getAdvancementManager() + .getAdvancement(new ResourceLocation("basemetals", "recipes/" + name)); + if (!player.getAdvancements().getProgress(advancement).isDone()) { + throw new IllegalStateException("Material discovery did not earn the recipe advancement: " + name); + } + IRecipe recipe = player.getServer().getRecipeManager().getRecipe(new ResourceLocation("basemetals", name)); + if (player.getRecipeBook().isUnlocked(recipe) == recipe.isDynamic()) { + throw new IllegalStateException("Wrong recipe-book visibility after mode change: " + name); + } + } + LOGGER.info("BASEMETALS_MODE_SWITCH_RECIPE PASS mode={}", + zone.moddev.mc.basemetals.config.BaseMetalsConfig.activeMode()); + } + LOGGER.info("BASEMETALS_MODE_LOGIN_SERVER PASS mode={}", + zone.moddev.mc.basemetals.config.BaseMetalsConfig.activeMode().serializedName()); } private void serverStarted(FMLServerStartedEvent event) { MinecraftServer server = event.getServer(); + if ("login".equals(System.getProperty("basemetalsprobe.mode"))) { + try { + int count = ContentModeChecks.run(server); + LOGGER.info("BASEMETALS_CONTENT_MODE_PROBE PASS mode={} checks={}", + zone.moddev.mc.basemetals.config.BaseMetalsConfig.activeMode().serializedName(), count); + } catch (Exception failure) { + throw new IllegalStateException(failure); + } + return; + } boolean legacyUpgrade = "legacy-upgrade".equals(System.getProperty("basemetalsprobe.mode")); try { runChecks(server); @@ -133,9 +178,14 @@ private void verifyLegacyFixture(MinecraftServer server, Path root) throws IOExc int checkedBuckets = 0; int checkedPlayerItems = 0; - if (!Files.isRegularFile(root.resolve("BASEMETALS_1_12_FIXTURE_COMPLETE.txt"))) { + boolean source110 = Files.isRegularFile(root.resolve("BASEMETALS_1_10_FIXTURE_COMPLETE.txt")); + String upgradeMarker = source110 ? "BASEMETALS_1_10_TO_1_13_UPGRADE" : "BASEMETALS_1_12_TO_1_13_UPGRADE"; + if (!source110 && !Files.isRegularFile(root.resolve("BASEMETALS_1_12_FIXTURE_COMPLETE.txt"))) { failures.add("missing legacy fixture completion marker"); } + if (source110 && !Files.isRegularFile(root.resolve("BASEMETALS_1_10_FIXTURE_RELOADED.txt"))) { + failures.add("1.10 fixture was not reopened in its source runtime"); + } JsonObject manifest; try (Reader reader = Files.newBufferedReader(root.resolve("legacy_registry_manifest_runtime.json"), StandardCharsets.UTF_8)) { @@ -155,12 +205,14 @@ private void verifyLegacyFixture(MinecraftServer server, Path root) throws IOExc oldState.get("z").getAsInt()); IBlockState actualState = world.getBlockState(pos); ResourceLocation actualId = ForgeRegistries.BLOCKS.getKey(actualState.getBlock()); - boolean stateMatches = matchesLegacyMetadata(actualState, - oldState.get("metadata").getAsInt()); + int metadata = oldState.has("saved_metadata") ? oldState.get("saved_metadata").getAsInt() + : oldState.get("metadata").getAsInt(); + boolean stateMatches = matchesLegacyMetadata(actualState, metadata) + && matchesSavedProperties(actualState, oldState); if (!expected.equals(String.valueOf(actualId)) || !stateMatches) { if (failures.size() < 20) { failures.add("block dim=" + dimension + " " + pos + " expected " + expected - + " metadata=" + oldState.get("metadata").getAsInt() + + " metadata=" + metadata + " but found " + actualState); } blockMismatches++; @@ -196,8 +248,10 @@ private void verifyLegacyFixture(MinecraftServer server, Path root) throws IOExc .equals(oldItem.get("id").getAsString()); boolean enchantmentMatches = !oldItem.has("enchanted") || !oldItem.get("enchanted").getAsBoolean() || EnchantmentHelper.getEnchantmentLevel(Enchantments.UNBREAKING, stack) == 2; + boolean nameMatches = !oldItem.has("custom_name") + || oldItem.get("custom_name").getAsString().equals(stack.getDisplayName().getString()); if (!expected.equals(actual) || stack.getCount() != expectedCount - || stack.getDamage() != expectedDamage || !proofMatches || !enchantmentMatches) { + || stack.getDamage() != expectedDamage || !proofMatches || !enchantmentMatches || !nameMatches) { if (failures.size() < 20) { failures.add("chest " + chestIndex + " slot " + slot + " expected " + expected + " x" + expectedCount + " damage=" + expectedDamage + " with fixture NBT but found " @@ -211,6 +265,7 @@ private void verifyLegacyFixture(MinecraftServer server, Path root) throws IOExc BlockPos armorPos = new BlockPos((int) Math.floor(oldItem.get("armor_x").getAsDouble()), (int) Math.floor(oldItem.get("armor_y").getAsDouble()), (int) Math.floor(oldItem.get("armor_z").getAsDouble())); + overworld.getBlockState(armorPos); List stands = overworld.getEntitiesWithinAABB(EntityArmorStand.class, new AxisAlignedBB(armorPos).grow(0.75D)); EntityEquipmentSlot equipmentSlot = equipmentSlot(oldItem.get("armor_slot").getAsString()); @@ -224,7 +279,8 @@ private void verifyLegacyFixture(MinecraftServer server, Path root) throws IOExc } } if (!equipped) { - if (failures.size() < 20) failures.add("missing armor-stand equipment " + expected); + if (failures.size() < 20) failures.add("missing armor-stand equipment " + expected + + " stands=" + stands.size() + " pos=" + armorPos); itemMismatches++; } checkedArmor++; @@ -286,10 +342,10 @@ private void verifyLegacyFixture(MinecraftServer server, Path root) throws IOExc } } - if (!Files.isRegularFile(root.resolve("legacy_orespawn3_basemetals.json"))) { + if (!source110 && !Files.isRegularFile(root.resolve("legacy_orespawn3_basemetals.json"))) { failures.add("missing packaged Base Metals OS3 rule fixture"); } - if (!Files.isRegularFile(root.resolve("legacy_orespawn3_orespawn.json"))) { + if (!source110 && !Files.isRegularFile(root.resolve("legacy_orespawn3_orespawn.json"))) { failures.add("missing configured OS3 rule fixture"); } @@ -298,12 +354,42 @@ private void verifyLegacyFixture(MinecraftServer server, Path root) throws IOExc + " player_items=" + checkedPlayerItems + " item_mismatches=" + itemMismatches; checks += checkedStates + checkedItems + checkedArmor + checkedBuckets + checkedPlayerItems; if (blockMismatches != 0 || itemMismatches != 0 || !failures.isEmpty()) { - writeFixtureResult(root, "BASEMETALS_1_12_TO_1_13_UPGRADE FAIL " + summary + writeFixtureResult(root, upgradeMarker + " FAIL " + summary + " samples=" + failures); - throw new IllegalStateException("1.12 fixture upgrade mismatch: " + summary + " samples=" + failures); + throw new IllegalStateException("Legacy fixture upgrade mismatch: " + summary + " samples=" + failures); + } + writeFixtureResult(root, upgradeMarker + " PASS " + summary); + LOGGER.info("{} PASS {}", upgradeMarker, summary); + } + + private static boolean matchesSavedProperties(IBlockState actual, JsonObject saved) { + if (!saved.has("saved_properties")) return true; + JsonObject properties = saved.getAsJsonObject("saved_properties"); + Map current = new java.util.LinkedHashMap(); + for (Map.Entry, Comparable> entry : actual.getValues().entrySet()) { + current.put(entry.getKey().getName(), entry.getValue().toString().toLowerCase(java.util.Locale.ROOT)); + } + + for (Map.Entry entry : properties.entrySet()) { + String key = entry.getKey(); + String value = entry.getValue().getAsString(); + if (actual.getBlock() instanceof BlockSlab && "half".equals(key)) key = "type"; + if (actual.getBlock() instanceof BlockDoor) { + boolean upper = "upper".equals(current.get("half")); + if (upper && ("facing".equals(key) || "open".equals(key))) continue; + if (!upper && ("hinge".equals(key) || "powered".equals(key))) continue; + } + + // Connected shapes are derived from neighbours; powered states and fluid levels can tick. + if ("variant".equals(key) || "shape".equals(key) || "powered".equals(key) || "level".equals(key) + || "north".equals(key) || "south".equals(key) || "east".equals(key) + || "west".equals(key) || "up".equals(key) || "down".equals(key)) continue; + if (actual.getBlock() instanceof BlockButton || actual.getBlock() instanceof net.minecraft.block.BlockLever) { + continue; // These changed from a single attachment property to face plus horizontal facing. + } + if (!value.equals(current.get(key))) return false; } - writeFixtureResult(root, "BASEMETALS_1_12_TO_1_13_UPGRADE PASS " + summary); - LOGGER.info("BASEMETALS_1_12_TO_1_13_UPGRADE PASS {}", summary); + return true; } private static NBTTagCompound inventoryItem(NBTTagList inventory, int slot) { @@ -365,7 +451,7 @@ private static WorldServer fixtureWorld(MinecraftServer server, int dimension) { } private static String currentBlockId(String legacy) { - ResourceLocation id = new ResourceLocation(legacy); + ResourceLocation id = new ResourceLocation(legacy.toLowerCase(java.util.Locale.ROOT)); if (BaseMetals.MOD_ID.equals(id.getNamespace()) || "mmdlib".equals(id.getNamespace())) { return BaseMetals.MOD_ID + ":" + MissingMappings.blockTargetPath(id.getPath()); } @@ -373,7 +459,7 @@ private static String currentBlockId(String legacy) { } private static String currentItemId(String legacy) { - ResourceLocation id = new ResourceLocation(legacy); + ResourceLocation id = new ResourceLocation(legacy.toLowerCase(java.util.Locale.ROOT)); if (BaseMetals.MOD_ID.equals(id.getNamespace()) || "mmdlib".equals(id.getNamespace())) { return MissingMappings.itemTargetId(id.getPath()).toString(); } @@ -382,11 +468,11 @@ private static String currentItemId(String legacy) { private static void writeFixtureResult(Path root, String result) { try { - Files.write(root.resolve("BASEMETALS_1_12_TO_1_13_UPGRADE_RESULT.txt"), + Files.write(root.resolve("BASEMETALS_LEGACY_TO_1_13_UPGRADE_RESULT.txt"), (result + System.lineSeparator()).getBytes(StandardCharsets.UTF_8), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING); } catch (IOException exception) { - LOGGER.error("Could not write 1.12 to 1.13 fixture result", exception); + LOGGER.error("Could not write legacy fixture result", exception); } } @@ -519,6 +605,7 @@ private void runChecks(MinecraftServer server) throws Exception { testShieldUpgrade(); testCrossbowContract(); checks += GameplayRegressionChecks.run(server); + checks += ContentModeChecks.run(server); } private void testProjectilePersistence(WorldServer world) { diff --git a/src/integrationTest/java/zone/moddev/mc/basemetals/testmod/ContentModeChecks.java b/src/integrationTest/java/zone/moddev/mc/basemetals/testmod/ContentModeChecks.java new file mode 100644 index 00000000..7b8d13e2 --- /dev/null +++ b/src/integrationTest/java/zone/moddev/mc/basemetals/testmod/ContentModeChecks.java @@ -0,0 +1,204 @@ +package zone.moddev.mc.basemetals.testmod; + +import java.lang.reflect.Method; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Random; +import java.util.UUID; +import com.mojang.authlib.GameProfile; +import net.minecraft.advancements.Advancement; +import net.minecraft.advancements.criterion.InventoryChangeTrigger; +import net.minecraft.entity.passive.EntityVillager; +import net.minecraft.init.Items; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.InventoryBasic; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.item.crafting.RecipeSerializers; +import net.minecraft.item.crafting.ShapedRecipe; +import net.minecraft.network.PacketBuffer; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.village.MerchantRecipeList; +import net.minecraft.world.WorldServer; +import net.minecraft.world.dimension.DimensionType; +import net.minecraft.world.storage.loot.LootContext; +import net.minecraft.world.storage.loot.LootTable; +import io.netty.buffer.Unpooled; +import zone.moddev.mc.basemetals.config.BaseMetalsConfig; +import zone.moddev.mc.basemetals.config.ContentPolicy; +import zone.moddev.mc.basemetals.content.ModContent; +import zone.moddev.mc.basemetals.loot.ContentModeLootCondition; +import zone.moddev.mc.basemetals.recipe.ContentCraftingRecipe; +import zone.moddev.mc.basemetals.trade.BaseMetalsTrades; +import zone.moddev.mc.basemetals.BaseMetalsEvents; +import zone.moddev.mc.basemetals.recipe.PlateRepairRecipe; +import net.minecraftforge.event.AnvilUpdateEvent; +import net.minecraftforge.common.util.FakePlayer; +import net.minecraftforge.registries.ForgeRegistries; + +/** Exercises the policy against loaded Forge recipes, trades and loot tables. */ +final class ContentModeChecks { + static int run(MinecraftServer server) throws Exception { + WorldServer world = server.getWorld(DimensionType.OVERWORLD); + ContentPolicy policy = ContentPolicy.active(); + int checks = 0; + int recipes = 0; + int restricted = 0; + + for (IRecipe recipe : server.getRecipeManager().getRecipes()) { + if (recipe.getSerializer() != ContentCraftingRecipe.SERIALIZER) continue; + recipes++; + boolean allowed = policy.allows(recipe.getRecipeOutput().getItem().getRegistryName().toString()); + if (!allowed) restricted++; + require(recipe.isDynamic() == !allowed, "recipe-book visibility " + recipe.getId()); + InventoryCrafting grid = new InventoryCrafting(new Container() { + @Override public boolean canInteractWith(net.minecraft.entity.player.EntityPlayer player) { return true; } + }, 3, 3); + boolean available = true; + int slot = 0; + int width = recipe instanceof ShapedRecipe ? ((ShapedRecipe) recipe).getWidth() : 3; + for (Ingredient ingredient : recipe.getIngredients()) { + int gridSlot = (slot / width) * 3 + slot % width; + slot++; + if (ingredient == Ingredient.EMPTY) continue; + ItemStack[] choices = ingredient.getMatchingStacks(); + if (choices.length == 0) { available = false; continue; } + grid.setInventorySlotContents(gridSlot, choices[0].copy()); + } + require(recipe.matches(grid, world) == (allowed && available), "crafting policy " + recipe.getId()); + if (!allowed) require(recipe.getCraftingResult(grid).isEmpty(), "restricted crafting result " + recipe.getId()); + + PacketBuffer packet = new PacketBuffer(Unpooled.buffer()); + RecipeSerializers.write(recipe, packet); + IRecipe restored = RecipeSerializers.read(packet); + require(restored.getId().equals(recipe.getId()) && restored.isDynamic() == recipe.isDynamic(), + "recipe packet identity " + recipe.getId()); + require((restored instanceof ShapedRecipe) == (recipe instanceof ShapedRecipe), + "recipe-book shape survives network sync " + recipe.getId()); + if (recipe instanceof ShapedRecipe) { + require(((ShapedRecipe) restored).getWidth() == width + && ((ShapedRecipe) restored).getHeight() == ((ShapedRecipe) recipe).getHeight(), + "recipe-book dimensions " + recipe.getId()); + } + packet.release(); + checks += 6; + } + require(recipes > 900, "full crafting catalogue tested"); + require(restricted > 0 == (BaseMetalsConfig.activeMode() == zone.moddev.mc.basemetals.config.ContentMode.LOW_FANTASY), + "expected restricted recipe count"); + + IRecipe mercury = server.getRecipeManager().getRecipe(new ResourceLocation("basemetals", "mercury_smallpowder_smelting")); + InventoryBasic furnace = new InventoryBasic(new TextComponentString("mode probe"), 3); + furnace.setInventorySlotContents(0, new ItemStack(ModContent.item("mercury_smallpowder").get())); + require(mercury.matches(furnace, world) == policy.allows("basemetals:mercury_nugget"), "mercury furnace policy"); + + for (IRecipe repair : server.getRecipeManager().getRecipes()) { + if (!(repair instanceof PlateRepairRecipe)) continue; + ItemStack[] plates = repair.getIngredients().get(1).getMatchingStacks(); + if (plates.length == 0) continue; + + InventoryBasic grid = new InventoryBasic(new TextComponentString("plate repair"), 9); + ItemStack damaged = repair.getRecipeOutput().copy(); + damaged.setDamage(7); + grid.setInventorySlotContents(0, damaged); + grid.setInventorySlotContents(8, plates[0].copy()); + boolean allowed = policy.allows(damaged.getItem().getRegistryName().toString()); + require(repair.matches(grid, world) == allowed, "plate repair policy " + repair.getId()); + require(repair.getCraftingResult(grid).isEmpty() == !allowed, "plate repair output " + repair.getId()); + require(damaged.getDamage() == 7, "repair preserves input " + repair.getId()); + checks += 3; + } + + for (String material : new String[] {"tin", "steel"}) { + AnvilUpdateEvent upgrade = new AnvilUpdateEvent(new ItemStack(ModContent.item("antimony_shield").get()), + new ItemStack(ModContent.item(material + "_plate").get()), "", 0); + new BaseMetalsEvents().onShieldUpgrade(upgrade); + require(upgrade.getOutput().isEmpty() == !policy.allows("basemetals:" + material + "_shield"), + "shield upgrade policy " + material); + checks++; + } + + Method sales = BaseMetalsTrades.class.getDeclaredMethod("selling", Item.class, int.class, int.class); + sales.setAccessible(true); + for (zone.moddev.mc.basemetals.content.RegistryHandle handle : ModContent.itemsById().values()) { + Item item = handle.get(); + String id = item.getRegistryName().toString(); + MerchantRecipeList offers = new MerchantRecipeList(); + EntityVillager.ITradeList factory = (EntityVillager.ITradeList) sales.invoke(null, item, 1, 1); + factory.addMerchantRecipe(null, offers, new Random(0)); + require(!offers.isEmpty() == (BaseMetalsConfig.VILLAGER_TRADES.get() && policy.allows(id)), "trade policy " + id); + net.minecraft.world.storage.loot.conditions.LootCondition condition = new ContentModeLootCondition(id); + require(condition.testCondition(null, null) == policy.allows(id), "loot condition " + id); + checks += 2; + } + + for (String name : new String[] {"abandoned_mineshaft", "desert_pyramid", "end_city_treasure", "jungle_temple", + "nether_bridge", "simple_dungeon", "spawn_bonus_chest", "stronghold_corridor", "stronghold_crossing", "village_blacksmith"}) { + LootTable table = server.getLootTableManager().getLootTableFromLocation( + new ResourceLocation("basemetals", "chests/inject/" + name)); + LootContext context = new LootContext(0, world, server.getLootTableManager(), null, null, null, world.getSpawnPoint()); + for (int seed = 0; seed < 100; seed++) { + for (ItemStack stack : table.generateLootForPools(new Random(seed), context)) { + require(policy.allows(stack.getItem().getRegistryName().toString()), "chest policy " + name + " " + stack); + checks++; + } + } + } + require(policy.allows(Items.BOW.getRegistryName().toString()), "vanilla bows remain unchanged"); + return checks + verifyMaterialDiscovery(server, world); + } + + private static int verifyMaterialDiscovery(MinecraftServer server, WorldServer world) { + Map materials = new LinkedHashMap<>(); + for (String metal : new String[] {"adamantine", "antimony", "aquarium", "bismuth", "brass", "bronze", + "coldiron", "copper", "cupronickel", "electrum", "invar", "lead", "mercury", "mithril", + "nickel", "obsidian", "pewter", "platinum", "silver", "starsteel", "steel", "tin", "zinc"}) { + materials.put(metal, ModContent.item(metal + "_ingot").get()); + } + materials.put("iron", Items.IRON_INGOT); + materials.put("gold", Items.GOLD_INGOT); + materials.put("diamond", Items.DIAMOND); + materials.put("emerald", Items.EMERALD); + materials.put("quartz", Items.QUARTZ); + materials.put("coal", Items.COAL); + materials.put("charcoal", Items.CHARCOAL); + materials.put("redstone", Items.REDSTONE); + materials.put("stone", ForgeRegistries.ITEMS.getValue(new ResourceLocation("minecraft", "stone"))); + materials.put("wood", ForgeRegistries.ITEMS.getValue(new ResourceLocation("minecraft", "oak_log"))); + + FakePlayer player = new FakePlayer(world, new GameProfile(UUID.randomUUID(), "MaterialDiscovery")); + int recipes = 0; + for (IRecipe recipe : server.getRecipeManager().getRecipes()) { + if (recipe.getSerializer() != ContentCraftingRecipe.SERIALIZER) continue; + + String name = recipe.getId().getPath(); + String material = name.matches("activator_rail|detector_rail|flint_and_steel|human_detector|minecart|piston|rail|tripwire_hook") + ? "steel" : name.substring(0, name.indexOf('_')); + require(materials.containsKey(material), "discovery material for " + name); + Advancement advancement = server.getAdvancementManager().getAdvancement( + new ResourceLocation("basemetals", "recipes/" + name)); + require(advancement != null && advancement.getCriteria().containsKey("has_material"), + "material discovery advancement " + name); + InventoryChangeTrigger.Instance condition = (InventoryChangeTrigger.Instance) + advancement.getCriteria().get("has_material").getCriterionInstance(); + + player.inventory.clear(); + player.inventory.setInventorySlotContents(0, new ItemStack(materials.get(material))); + require(condition.test(player.inventory), "base material does not discover " + name); + player.inventory.setInventorySlotContents(0, new ItemStack(Items.STICK)); + require(!condition.test(player.inventory), "unrelated item discovers " + name); + recipes++; + } + require(recipes == 1024, "full material discovery catalogue tested"); + return recipes * 2; + } + + private static void require(boolean result, String message) { + if (!result) throw new IllegalStateException("Content-mode check failed: " + message); + } +} diff --git a/src/main/java/zone/moddev/mc/basemetals/BaseMetals.java b/src/main/java/zone/moddev/mc/basemetals/BaseMetals.java index b48cf3cf..ea03a7ec 100644 --- a/src/main/java/zone/moddev/mc/basemetals/BaseMetals.java +++ b/src/main/java/zone/moddev/mc/basemetals/BaseMetals.java @@ -9,6 +9,9 @@ import zone.moddev.mc.basemetals.entity.ModEntities; import zone.moddev.mc.basemetals.migration.LegacyWorldDataHook; import zone.moddev.mc.basemetals.recipe.CrushingRecipe; +import zone.moddev.mc.basemetals.loot.ContentModeLootCondition; +import zone.moddev.mc.basemetals.network.ContentModeNetwork; +import net.minecraft.world.storage.loot.conditions.LootConditionManager; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.common.MinecraftForge; @@ -16,6 +19,7 @@ import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.config.ModConfig; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; @Mod(BaseMetals.MOD_ID) public final class BaseMetals { @@ -24,10 +28,13 @@ public final class BaseMetals { public BaseMetals() { LegacyWorldDataHook.register(); + ContentModeNetwork.register(); ModContent.initializeFluids(); CrushingRecipe.register(); + LootConditionManager.registerCondition(new ContentModeLootCondition.Serializer()); ModEntities.initialize(); ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, BaseMetalsConfig.SPEC); + FMLJavaModLoadingContext.get().getModEventBus().addListener(BaseMetalsConfig::onConfigLoading); MinecraftForge.EVENT_BUS.register(new BaseMetalsEvents()); DistExecutor.runWhenOn(Dist.CLIENT, () -> ClientSetup::register); } diff --git a/src/main/java/zone/moddev/mc/basemetals/BaseMetalsEvents.java b/src/main/java/zone/moddev/mc/basemetals/BaseMetalsEvents.java index 13b97ae0..74f3b570 100644 --- a/src/main/java/zone/moddev/mc/basemetals/BaseMetalsEvents.java +++ b/src/main/java/zone/moddev/mc/basemetals/BaseMetalsEvents.java @@ -1,11 +1,14 @@ package zone.moddev.mc.basemetals; import java.util.ArrayList; +import java.util.Collections; import java.util.EnumMap; import java.util.LinkedHashMap; import java.util.Map; import zone.moddev.mc.basemetals.config.BaseMetalsConfig; +import zone.moddev.mc.basemetals.config.ContentPolicy; +import zone.moddev.mc.basemetals.config.MaterialForm; import zone.moddev.mc.basemetals.content.CrackhammerItem; import zone.moddev.mc.basemetals.content.MaterialBacked; import zone.moddev.mc.basemetals.content.MaterialItems; @@ -14,6 +17,8 @@ import zone.moddev.mc.basemetals.recipe.CrushingRecipe; import net.minecraft.block.state.IBlockState; +import net.minecraft.advancements.Advancement; +import net.minecraft.item.crafting.IRecipe; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.CreatureAttribute; import net.minecraft.entity.Entity; @@ -43,6 +48,25 @@ /** Handles crushing, shield upgrades and material equipment effects. */ public final class BaseMetalsEvents { + @SubscribeEvent + public void onPlayerLogin(PlayerEvent.PlayerLoggedInEvent event) { + if (!(event.getPlayer() instanceof EntityPlayerMP)) return; + EntityPlayerMP player = (EntityPlayerMP) event.getPlayer(); + + // An advancement can be earned while its recipe is disabled. Restore the + // unlock after a mode change without resetting the player's progress. + for (IRecipe recipe : player.getServer().getRecipeManager().getRecipes()) { + if (!BaseMetals.MOD_ID.equals(recipe.getId().getNamespace()) || recipe.isDynamic() + || player.getRecipeBook().isUnlocked(recipe)) continue; + + Advancement advancement = player.getServer().getAdvancementManager().getAdvancement( + new ResourceLocation(BaseMetals.MOD_ID, "recipes/" + recipe.getId().getPath())); + if (advancement != null && player.getAdvancements().getProgress(advancement).isDone()) { + player.unlockRecipes(Collections.singletonList(recipe)); + } + } + } + @SubscribeEvent(priority = EventPriority.LOWEST) public void onBreak(BlockEvent.BreakEvent event) { EntityPlayer player = event.getPlayer(); @@ -171,6 +195,7 @@ public void onShieldUpgrade(AnvilUpdateEvent event) { MaterialDefinition current = ((MaterialItems.Shield) event.getLeft().getItem()).baseMetalsMaterial(); MaterialDefinition upgrade = null; for (MaterialDefinition candidate : shieldMaterials().values()) { + if (!ContentPolicy.active().allows(candidate.name(), MaterialForm.SHIELD)) continue; if (candidate.hardness() <= current.hardness()) continue; ItemTags.Wrapper plate = new ItemTags.Wrapper( new ResourceLocation("forge", "plates/" + candidate.name())); diff --git a/src/main/java/zone/moddev/mc/basemetals/client/BaseMetalsConfigScreen.java b/src/main/java/zone/moddev/mc/basemetals/client/BaseMetalsConfigScreen.java new file mode 100644 index 00000000..d65fc1c3 --- /dev/null +++ b/src/main/java/zone/moddev/mc/basemetals/client/BaseMetalsConfigScreen.java @@ -0,0 +1,157 @@ +package zone.moddev.mc.basemetals.client; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.gui.GuiYesNo; +import net.minecraft.client.resources.I18n; +import net.minecraftforge.common.ForgeConfigSpec; +import zone.moddev.mc.basemetals.config.BaseMetalsConfig; +import zone.moddev.mc.basemetals.config.ConfigEdits; +import zone.moddev.mc.basemetals.config.ContentMode; + +/** The same screen is used by Forge's Mods list and OreSpawn's configuration cog. */ +public final class BaseMetalsConfigScreen extends GuiScreen { + private static final String PREFIX = "config.basemetals."; + private static final String[] OPTIONS = { + "specialEffects", "starsteelRegeneration", "mercuryImmersionEffects", "villagerTrades" + }; + private static final ForgeConfigSpec.BooleanValue[] VALUES = { + BaseMetalsConfig.SPECIAL_EFFECTS, BaseMetalsConfig.STARSTEEL_REGENERATION, + BaseMetalsConfig.MERCURY_EFFECTS, BaseMetalsConfig.VILLAGER_TRADES + }; + + private final GuiScreen parent; + private final ConfigEdits edits; + private final List